Moved Gesture::State and -::Type to gesture-enumerations.h.

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

diff --git a/automated-tests/src/dali-internal/utc-Dali-Internal-PinchGesture.cpp b/automated-tests/src/dali-internal/utc-Dali-Internal-PinchGesture.cpp
index 8ce75ac..0447e34 100644 (file)
--- a/automated-tests/src/dali-internal/utc-Dali-Internal-PinchGesture.cpp
+++ b/automated-tests/src/dali-internal/utc-Dali-Internal-PinchGesture.cpp
@@ -39,39 +39,39 @@ int UtcDaliPinchGestureConstructor(void)
 {
   TestApplication application; // Reset all test adapter return codes
 
-  PinchGesture gesture(new Internal::PinchGesture( Gesture::Started ));
-  DALI_TEST_EQUALS(Gesture::Started, gesture.GetState(), TEST_LOCATION);
+  PinchGesture gesture(new Internal::PinchGesture( GestureState::STARTED ));
+  DALI_TEST_EQUALS(GestureState::STARTED, gesture.GetState(), TEST_LOCATION);
   DALI_TEST_EQUALS(0.0f, gesture.GetScale(), TEST_LOCATION);
   DALI_TEST_EQUALS(0.0f, gesture.GetSpeed(), TEST_LOCATION);
-  DALI_TEST_EQUALS(Gesture::Pinch, gesture.GetType(), TEST_LOCATION);
+  DALI_TEST_EQUALS(GestureType::PINCH, gesture.GetType(), TEST_LOCATION);
 
-  PinchGesture gesture2(new Internal::PinchGesture( Gesture::Continuing ));
-  DALI_TEST_EQUALS(Gesture::Continuing, gesture2.GetState(), TEST_LOCATION);
+  PinchGesture gesture2(new Internal::PinchGesture( GestureState::CONTINUING ));
+  DALI_TEST_EQUALS(GestureState::CONTINUING, gesture2.GetState(), TEST_LOCATION);
   DALI_TEST_EQUALS(0.0f, gesture2.GetScale(), TEST_LOCATION);
   DALI_TEST_EQUALS(0.0f, gesture2.GetSpeed(), TEST_LOCATION);
-  DALI_TEST_EQUALS(Gesture::Pinch, gesture2.GetType(), TEST_LOCATION);
+  DALI_TEST_EQUALS(GestureType::PINCH, gesture2.GetType(), TEST_LOCATION);
 
-  PinchGesture gesture3(new Internal::PinchGesture( Gesture::Finished ));
-  DALI_TEST_EQUALS(Gesture::Finished, gesture3.GetState(), TEST_LOCATION);
+  PinchGesture gesture3(new Internal::PinchGesture( GestureState::FINISHED ));
+  DALI_TEST_EQUALS(GestureState::FINISHED, gesture3.GetState(), TEST_LOCATION);
   DALI_TEST_EQUALS(0.0f, gesture3.GetScale(), TEST_LOCATION);
   DALI_TEST_EQUALS(0.0f, gesture3.GetSpeed(), TEST_LOCATION);
-  DALI_TEST_EQUALS(Gesture::Pinch, gesture3.GetType(), TEST_LOCATION);
+  DALI_TEST_EQUALS(GestureType::PINCH, gesture3.GetType(), TEST_LOCATION);
 
   // Test copy constructor
   GetImplementation( gesture3 ).SetScale( 3.0f );
   GetImplementation( gesture3 ).SetSpeed( 5.0f );
 
   PinchGesture pinch(gesture3);
-  DALI_TEST_EQUALS(Gesture::Finished, pinch.GetState(), TEST_LOCATION);
+  DALI_TEST_EQUALS(GestureState::FINISHED, pinch.GetState(), TEST_LOCATION);
   DALI_TEST_EQUALS(3.0f, pinch.GetScale(), TEST_LOCATION);
   DALI_TEST_EQUALS(5.0f, pinch.GetSpeed(), TEST_LOCATION);
-  DALI_TEST_EQUALS(Gesture::Pinch, pinch.GetType(), TEST_LOCATION);
+  DALI_TEST_EQUALS(GestureType::PINCH, pinch.GetType(), TEST_LOCATION);
 
   // Test move constructor
   const auto refCount = gesture.GetObjectPtr()->ReferenceCount();
   PinchGesture gesture4( std::move( gesture ) );
   DALI_TEST_CHECK(!gesture);
-  DALI_TEST_EQUALS(Gesture::Pinch, gesture4.GetType(), TEST_LOCATION);
+  DALI_TEST_EQUALS(GestureType::PINCH, gesture4.GetType(), TEST_LOCATION);
   DALI_TEST_EQUALS(gesture4.GetBaseObject().ReferenceCount(), refCount, TEST_LOCATION);
 
   END_TEST;
@@ -80,26 +80,26 @@ int UtcDaliPinchGestureConstructor(void)
 int UtcDaliPinchGestureAssignment(void)
 {
   // Test Assignment operator
-  PinchGesture gesture(new Internal::PinchGesture( Gesture::Started ));
-  DALI_TEST_EQUALS(Gesture::Started, gesture.GetState(), TEST_LOCATION);
+  PinchGesture gesture(new Internal::PinchGesture( GestureState::STARTED ));
+  DALI_TEST_EQUALS(GestureState::STARTED, gesture.GetState(), TEST_LOCATION);
   DALI_TEST_EQUALS(0.0f, gesture.GetScale(), TEST_LOCATION);
   DALI_TEST_EQUALS(0.0f, gesture.GetSpeed(), TEST_LOCATION);
-  DALI_TEST_EQUALS(Gesture::Pinch, gesture.GetType(), TEST_LOCATION);
+  DALI_TEST_EQUALS(GestureType::PINCH, gesture.GetType(), TEST_LOCATION);
 
-  PinchGesture gesture2(new Internal::PinchGesture( Gesture::Continuing ));
-  DALI_TEST_EQUALS(Gesture::Continuing, gesture2.GetState(), TEST_LOCATION);
+  PinchGesture gesture2(new Internal::PinchGesture( GestureState::CONTINUING ));
+  DALI_TEST_EQUALS(GestureState::CONTINUING, gesture2.GetState(), TEST_LOCATION);
   DALI_TEST_EQUALS(0.0f, gesture2.GetScale(), TEST_LOCATION);
   DALI_TEST_EQUALS(0.0f, gesture2.GetSpeed(), TEST_LOCATION);
-  DALI_TEST_EQUALS(Gesture::Pinch, gesture2.GetType(), TEST_LOCATION);
+  DALI_TEST_EQUALS(GestureType::PINCH, gesture2.GetType(), TEST_LOCATION);
 
   GetImplementation( gesture2 ).SetScale( 3.0f );
   GetImplementation( gesture2 ).SetSpeed( 5.0f );
 
   gesture = gesture2;
-  DALI_TEST_EQUALS(Gesture::Continuing, gesture.GetState(), TEST_LOCATION);
+  DALI_TEST_EQUALS(GestureState::CONTINUING, gesture.GetState(), TEST_LOCATION);
   DALI_TEST_EQUALS(3.0f, gesture.GetScale(), TEST_LOCATION);
   DALI_TEST_EQUALS(5.0f, gesture.GetSpeed(), TEST_LOCATION);
-  DALI_TEST_EQUALS(Gesture::Pinch, gesture.GetType(), TEST_LOCATION);
+  DALI_TEST_EQUALS(GestureType::PINCH, gesture.GetType(), TEST_LOCATION);
 
   // Move assignment
   const auto refCount = gesture.GetObjectPtr()->ReferenceCount();
@@ -107,7 +107,7 @@ int UtcDaliPinchGestureAssignment(void)
   DALI_TEST_EQUALS(gesture3, Gesture(), TEST_LOCATION);
   gesture3 = std::move(gesture);
   DALI_TEST_CHECK(!gesture);
-  DALI_TEST_EQUALS(Gesture::Pinch, gesture3.GetType(), TEST_LOCATION);
+  DALI_TEST_EQUALS(GestureType::PINCH, gesture3.GetType(), TEST_LOCATION);
   DALI_TEST_EQUALS(gesture3.GetBaseObject().ReferenceCount(), refCount, TEST_LOCATION);
 
   END_TEST;
@@ -115,7 +115,7 @@ int UtcDaliPinchGestureAssignment(void)
 
 int UtcDaliPinchGestureSetGetScaleP(void)
 {
-  PinchGesture gesture(new Internal::PinchGesture(Gesture::Started));
+  PinchGesture gesture(new Internal::PinchGesture(GestureState::STARTED));
   DALI_TEST_EQUALS(gesture.GetScale(), 0.0f, TEST_LOCATION);
 
   GetImplementation(gesture).SetScale(123.0f);
@@ -126,7 +126,7 @@ int UtcDaliPinchGestureSetGetScaleP(void)
 
 int UtcDaliPinchGestureSetGetSpeedP(void)
 {
-  PinchGesture gesture(new Internal::PinchGesture(Gesture::Started));
+  PinchGesture gesture(new Internal::PinchGesture(GestureState::STARTED));
   DALI_TEST_EQUALS(gesture.GetSpeed(), 0.0f, TEST_LOCATION);
 
   GetImplementation(gesture).SetSpeed(123.0f);
@@ -137,7 +137,7 @@ int UtcDaliPinchGestureSetGetSpeedP(void)
 
 int UtcDaliPinchGestureSetGetScreenCenterPointP(void)
 {
-  PinchGesture gesture(new Internal::PinchGesture(Gesture::Started));
+  PinchGesture gesture(new Internal::PinchGesture(GestureState::STARTED));
   DALI_TEST_EQUALS(gesture.GetScreenCenterPoint(), Vector2::ZERO, TEST_LOCATION);
 
   GetImplementation(gesture).SetScreenCenterPoint(Vector2(123.0f, 321.0f));
@@ -148,7 +148,7 @@ int UtcDaliPinchGestureSetGetScreenCenterPointP(void)
 
 int UtcDaliPinchGestureSetGetLocalCenterPointP(void)
 {
-  PinchGesture gesture(new Internal::PinchGesture(Gesture::Started));
+  PinchGesture gesture(new Internal::PinchGesture(GestureState::STARTED));
   DALI_TEST_EQUALS(gesture.GetLocalCenterPoint(), Vector2::ZERO, TEST_LOCATION);
 
   GetImplementation(gesture).SetLocalCenterPoint(Vector2(123.0f,321.0f));