Revert "[Tizen] Add Integration API to Create public event type"

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

diff --git a/automated-tests/src/dali/utc-Dali-TouchEvent.cpp b/automated-tests/src/dali/utc-Dali-TouchEvent.cpp
index dbd663b..bd58584 100644 (file)
--- a/automated-tests/src/dali/utc-Dali-TouchEvent.cpp
+++ b/automated-tests/src/dali/utc-Dali-TouchEvent.cpp
@@ -15,12 +15,12 @@
  *
  */
 
-#include <iostream>
+#include <dali-test-suite-utils.h>
+#include <dali/integration-api/events/touch-integ.h>
+#include <dali/public-api/dali-core.h>
 #include <stdlib.h>
 
-#include <dali/public-api/dali-core.h>
-#include <dali/integration-api/events/touch-integ.h>
-#include <dali-test-suite-utils.h>
+#include <iostream>
 
 void utc_dali_touch_event_startup(void)
 {
@@ -38,27 +38,27 @@ TouchPoint GenerateTouchPoint()
 {
   return TouchPoint(1, PointState::STARTED, 100.0f, 200.0f);
 }
-}
+} // namespace
 
 int UtcDaliTouchEventConstructorP(void)
 {
   TouchEvent touchEvent;
-  DALI_TEST_CHECK( !touchEvent );
+  DALI_TEST_CHECK(!touchEvent);
   END_TEST;
 }
 
 int UtcDaliTouchEventCopyConstructorP(void)
 {
   TouchEvent touchEvent = Integration::NewTouchEvent(123u, GenerateTouchPoint());
-  DALI_TEST_CHECK( touchEvent );
+  DALI_TEST_CHECK(touchEvent);
 
   const auto refCount = touchEvent.GetBaseObject().ReferenceCount();
 
-  TouchEvent touchEvent2( touchEvent );
-  DALI_TEST_CHECK( touchEvent );
-  DALI_TEST_CHECK( touchEvent2 );
-  DALI_TEST_EQUALS( touchEvent, touchEvent2, TEST_LOCATION );
-  DALI_TEST_EQUALS( refCount + 1, touchEvent.GetBaseObject().ReferenceCount(), TEST_LOCATION );
+  TouchEvent touchEvent2(touchEvent);
+  DALI_TEST_CHECK(touchEvent);
+  DALI_TEST_CHECK(touchEvent2);
+  DALI_TEST_EQUALS(touchEvent, touchEvent2, TEST_LOCATION);
+  DALI_TEST_EQUALS(refCount + 1, touchEvent.GetBaseObject().ReferenceCount(), TEST_LOCATION);
 
   END_TEST;
 }
@@ -66,14 +66,14 @@ int UtcDaliTouchEventCopyConstructorP(void)
 int UtcDaliTouchEventMoveConstructorP(void)
 {
   TouchEvent touchEvent = Integration::NewTouchEvent(123u, GenerateTouchPoint());
-  DALI_TEST_CHECK( touchEvent );
+  DALI_TEST_CHECK(touchEvent);
 
   const auto refCount = touchEvent.GetBaseObject().ReferenceCount();
 
-  TouchEvent touchEvent2( std::move(touchEvent) );
-  DALI_TEST_CHECK( !touchEvent );
-  DALI_TEST_CHECK( touchEvent2 );
-  DALI_TEST_EQUALS( refCount, touchEvent2.GetBaseObject().ReferenceCount(), TEST_LOCATION );
+  TouchEvent touchEvent2(std::move(touchEvent));
+  DALI_TEST_CHECK(!touchEvent);
+  DALI_TEST_CHECK(touchEvent2);
+  DALI_TEST_EQUALS(refCount, touchEvent2.GetBaseObject().ReferenceCount(), TEST_LOCATION);
 
   END_TEST;
 }
@@ -81,18 +81,18 @@ int UtcDaliTouchEventMoveConstructorP(void)
 int UtcDaliTouchEventCopyAssignmentP(void)
 {
   TouchEvent touchEvent = Integration::NewTouchEvent(123u, GenerateTouchPoint());
-  DALI_TEST_CHECK( touchEvent );
+  DALI_TEST_CHECK(touchEvent);
 
   const auto refCount = touchEvent.GetBaseObject().ReferenceCount();
 
   TouchEvent touchEvent2;
-  DALI_TEST_CHECK( !touchEvent2 );
+  DALI_TEST_CHECK(!touchEvent2);
 
   touchEvent2 = touchEvent;
-  DALI_TEST_CHECK( touchEvent );
-  DALI_TEST_CHECK( touchEvent2 );
-  DALI_TEST_EQUALS( touchEvent, touchEvent2, TEST_LOCATION );
-  DALI_TEST_EQUALS( refCount + 1, touchEvent.GetBaseObject().ReferenceCount(), TEST_LOCATION );
+  DALI_TEST_CHECK(touchEvent);
+  DALI_TEST_CHECK(touchEvent2);
+  DALI_TEST_EQUALS(touchEvent, touchEvent2, TEST_LOCATION);
+  DALI_TEST_EQUALS(refCount + 1, touchEvent.GetBaseObject().ReferenceCount(), TEST_LOCATION);
 
   END_TEST;
 }
@@ -100,17 +100,62 @@ int UtcDaliTouchEventCopyAssignmentP(void)
 int UtcDaliTouchEventMoveAssignmentP(void)
 {
   TouchEvent touchEvent = Integration::NewTouchEvent(123u, GenerateTouchPoint());
-  DALI_TEST_CHECK( touchEvent );
+  DALI_TEST_CHECK(touchEvent);
 
   const auto refCount = touchEvent.GetBaseObject().ReferenceCount();
 
   TouchEvent touchEvent2;
-  DALI_TEST_CHECK( !touchEvent2 );
+  DALI_TEST_CHECK(!touchEvent2);
 
   touchEvent2 = std::move(touchEvent);
-  DALI_TEST_CHECK( !touchEvent );
-  DALI_TEST_CHECK( touchEvent2 );
-  DALI_TEST_EQUALS( refCount, touchEvent2.GetBaseObject().ReferenceCount(), TEST_LOCATION );
+  DALI_TEST_CHECK(!touchEvent);
+  DALI_TEST_CHECK(touchEvent2);
+  DALI_TEST_EQUALS(refCount, touchEvent2.GetBaseObject().ReferenceCount(), TEST_LOCATION);
+
+  END_TEST;
+}
+
+int UtcDaliTouchEventCopyConstructorWithPointP(void)
+{
+  Dali::Integration::Point point;
+
+  Vector2 touchPoint(10.0, 20.0);
+  point.SetDeviceId(1);
+  point.SetState(PointState::DOWN);
+  point.SetScreenPosition(Vector2(touchPoint.x, touchPoint.y));
+
+  TouchEvent touchEvent = Integration::NewTouchEvent(123u, point);
+  DALI_TEST_CHECK(touchEvent);
+
+  const auto refCount = touchEvent.GetBaseObject().ReferenceCount();
+
+  TouchEvent touchEvent2(touchEvent);
+  DALI_TEST_CHECK(touchEvent);
+  DALI_TEST_CHECK(touchEvent2);
+  DALI_TEST_EQUALS(touchEvent, touchEvent2, TEST_LOCATION);
+  DALI_TEST_EQUALS(refCount + 1, touchEvent.GetBaseObject().ReferenceCount(), TEST_LOCATION);
+
+  END_TEST;
+}
+
+int UtcDaliTouchEventMoveConstructorWithPointP(void)
+{
+  Dali::Integration::Point point;
+
+  Vector2 touchPoint(10.0, 20.0);
+  point.SetDeviceId(1);
+  point.SetState(PointState::DOWN);
+  point.SetScreenPosition(Vector2(touchPoint.x, touchPoint.y));
+
+  TouchEvent touchEvent = Integration::NewTouchEvent(123u, point);
+  DALI_TEST_CHECK(touchEvent);
+
+  const auto refCount = touchEvent.GetBaseObject().ReferenceCount();
+
+  TouchEvent touchEvent2(std::move(touchEvent));
+  DALI_TEST_CHECK(!touchEvent);
+  DALI_TEST_CHECK(touchEvent2);
+  DALI_TEST_EQUALS(refCount, touchEvent2.GetBaseObject().ReferenceCount(), TEST_LOCATION);
 
   END_TEST;
 }