Add an empty constructor for PanGesture 94/35294/2
authorRichard Huang <r.huang@samsung.com>
Wed, 11 Feb 2015 15:44:21 +0000 (15:44 +0000)
committerRichard Huang <r.huang@samsung.com>
Wed, 11 Feb 2015 16:51:19 +0000 (16:51 +0000)
Change-Id: I94afbcd85bf330340af068c7e185158a23a5d0d8

automated-tests/src/dali/utc-Dali-PanGesture.cpp
dali/public-api/events/pan-gesture.cpp
dali/public-api/events/pan-gesture.h

index 681da1d..814850f 100644 (file)
@@ -39,25 +39,30 @@ int UtcDaliPanGestureConstructor(void)
 {
   TestApplication application; // Reset all test adapter return codes
 
-  PanGesture gesture(Gesture::Started);
-  DALI_TEST_EQUALS(Gesture::Started, gesture.state, TEST_LOCATION);
+  PanGesture gesture;
+  DALI_TEST_EQUALS(Gesture::Clear, gesture.state, TEST_LOCATION);
   DALI_TEST_EQUALS(1u, gesture.numberOfTouches, TEST_LOCATION);
   DALI_TEST_EQUALS(Gesture::Pan, gesture.type, TEST_LOCATION);
 
-  PanGesture gesture2(Gesture::Continuing);
-  DALI_TEST_EQUALS(Gesture::Continuing, gesture2.state, TEST_LOCATION);
+  PanGesture gesture2(Gesture::Started);
+  DALI_TEST_EQUALS(Gesture::Started, gesture2.state, TEST_LOCATION);
   DALI_TEST_EQUALS(1u, gesture2.numberOfTouches, TEST_LOCATION);
   DALI_TEST_EQUALS(Gesture::Pan, gesture2.type, TEST_LOCATION);
 
-  PanGesture gesture3(Gesture::Finished);
-  DALI_TEST_EQUALS(Gesture::Finished, gesture3.state, TEST_LOCATION);
+  PanGesture gesture3(Gesture::Continuing);
+  DALI_TEST_EQUALS(Gesture::Continuing, gesture3.state, TEST_LOCATION);
   DALI_TEST_EQUALS(1u, gesture3.numberOfTouches, TEST_LOCATION);
   DALI_TEST_EQUALS(Gesture::Pan, gesture3.type, TEST_LOCATION);
 
+  PanGesture gesture4(Gesture::Finished);
+  DALI_TEST_EQUALS(Gesture::Finished, gesture4.state, TEST_LOCATION);
+  DALI_TEST_EQUALS(1u, gesture4.numberOfTouches, TEST_LOCATION);
+  DALI_TEST_EQUALS(Gesture::Pan, gesture4.type, TEST_LOCATION);
+
   // Test copy constructor
-  gesture3.numberOfTouches = 3u;
+  gesture4.numberOfTouches = 3u;
 
-  PanGesture pan(gesture3);
+  PanGesture pan(gesture4);
   DALI_TEST_EQUALS(Gesture::Finished, pan.state, TEST_LOCATION);
   DALI_TEST_EQUALS(3u, pan.numberOfTouches, TEST_LOCATION);
   DALI_TEST_EQUALS(Gesture::Pan, pan.type, TEST_LOCATION);
index 3608d34..d5545a7 100644 (file)
 namespace Dali
 {
 
+PanGesture::PanGesture()
+: Gesture(Gesture::Pan, Gesture::Clear),
+  numberOfTouches(1)
+{
+}
+
 PanGesture::PanGesture(Gesture::State state)
 : Gesture(Gesture::Pan, state),
   numberOfTouches(1)
index 5be62b7..00b5baa 100644 (file)
@@ -46,6 +46,11 @@ struct DALI_IMPORT_API PanGesture: public Gesture
 
   /**
    * @brief Default Constructor.
+   */
+  PanGesture();
+
+  /**
+   * @brief Constructor.
    *
    * @param[in]  state  The state of the gesture
    */