projects
/
platform
/
core
/
uifw
/
dali-core.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Refactoring of path constraints + LinearConstrainer
[platform/core/uifw/dali-core.git]
/
automated-tests
/
src
/
dali
/
utc-Dali-PanGesture.cpp
diff --git
a/automated-tests/src/dali/utc-Dali-PanGesture.cpp
b/automated-tests/src/dali/utc-Dali-PanGesture.cpp
index
919d40f
..
814850f
100644
(file)
--- a/
automated-tests/src/dali/utc-Dali-PanGesture.cpp
+++ b/
automated-tests/src/dali/utc-Dali-PanGesture.cpp
@@
-18,7
+18,7
@@
#include <iostream>
#include <stdlib.h>
#include <iostream>
#include <stdlib.h>
-#include <dali/
dali
.h>
+#include <dali/
public-api/dali-core
.h>
#include <dali-test-suite-utils.h>
using namespace Dali;
#include <dali-test-suite-utils.h>
using namespace Dali;
@@
-39,25
+39,30
@@
int UtcDaliPanGestureConstructor(void)
{
TestApplication application; // Reset all test adapter return codes
{
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);
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);
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);
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
// Test copy constructor
- gesture
3
.numberOfTouches = 3u;
+ gesture
4
.numberOfTouches = 3u;
- PanGesture pan(gesture
3
);
+ PanGesture pan(gesture
4
);
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);
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);