projects
/
platform
/
core
/
uifw
/
dali-toolkit.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
(AutomatedTests) Removed Zero Ruler test as it is no longer possible to create one
[platform/core/uifw/dali-toolkit.git]
/
automated-tests
/
src
/
dali-toolkit-unmanaged
/
utc-Dali-ScrollView.cpp
diff --git
a/automated-tests/src/dali-toolkit-unmanaged/utc-Dali-ScrollView.cpp
b/automated-tests/src/dali-toolkit-unmanaged/utc-Dali-ScrollView.cpp
index
d554677
..
867abd8
100644
(file)
--- a/
automated-tests/src/dali-toolkit-unmanaged/utc-Dali-ScrollView.cpp
+++ b/
automated-tests/src/dali-toolkit-unmanaged/utc-Dali-ScrollView.cpp
@@
-143,9
+143,7
@@
int Wait(ToolkitTestApplication& application, int duration = 0)
static bool gOnScrollStartCalled; ///< Whether the OnScrollStart signal was invoked.
static bool gOnScrollUpdateCalled; ///< Whether the OnScrollUpdate signal was invoked.
static bool gOnScrollCompleteCalled; ///< Whether the OnScrollComplete signal was invoked.
static bool gOnScrollStartCalled; ///< Whether the OnScrollStart signal was invoked.
static bool gOnScrollUpdateCalled; ///< Whether the OnScrollUpdate signal was invoked.
static bool gOnScrollCompleteCalled; ///< Whether the OnScrollComplete signal was invoked.
-static bool gOnScrollClampedCalled; ///< Whether the OnScrollClamped signal was invoked.
static bool gOnSnapStartCalled; ///< Whether the OnSnapStart signal was invoked.
static bool gOnSnapStartCalled; ///< Whether the OnSnapStart signal was invoked.
-static ClampState3 gLastClampPosition; ///< Clamping information from OnScrollClampedEvent.
static SnapType gLastSnapType; ///< Snaping information from SnapEvent.
static Vector3 gConstraintResult; ///< Result from constraint.
static SnapType gLastSnapType; ///< Snaping information from SnapEvent.
static Vector3 gConstraintResult; ///< Result from constraint.
@@
-180,17
+178,6
@@
static void OnScrollComplete( const Vector3& position )
}
/**
}
/**
- * Invoked when scrolling clamped.
- *
- * @param[in] event The position/scale/rotation axes that were clamped.
- */
-static void OnScrollClamped( const ScrollView::ClampEvent& event )
-{
- gOnScrollClampedCalled = true;
- gLastClampPosition = event.position;
-}
-
-/**
* Invoked when a snap or flick started.
*
* @param[in] event The type of snap and the target position/scale/rotation.
* Invoked when a snap or flick started.
*
* @param[in] event The type of snap and the target position/scale/rotation.
@@
-1052,27
+1039,16
@@
int UtcDaliRulerFixedRulerSpacing(void)
ToolkitTestApplication application;
tet_infoline(" UtcDaliRulerFixedRulerSpacing");
ToolkitTestApplication application;
tet_infoline(" UtcDaliRulerFixedRulerSpacing");
- RulerPtr rulerZero = new FixedRuler( 0.0f );
- rulerZero->SetDomain( RulerDomain(10.0f, 90.0f, true) );
-
RulerPtr rulerNormal = new FixedRuler( 25.0f );
rulerNormal->SetDomain( RulerDomain(10.0f, 90.0f, true) );
unsigned int volume;
float position;
RulerPtr rulerNormal = new FixedRuler( 25.0f );
rulerNormal->SetDomain( RulerDomain(10.0f, 90.0f, true) );
unsigned int volume;
float position;
- position = rulerZero->GetPositionFromPage(1, volume, true);
- DALI_TEST_EQUALS( position, 10.0f, TEST_LOCATION );
- DALI_TEST_EQUALS( volume, 1u, TEST_LOCATION );
-
position = rulerNormal->GetPositionFromPage(1, volume, true);
DALI_TEST_EQUALS( position, 35.0f, TEST_LOCATION );
DALI_TEST_EQUALS( volume, 0u, TEST_LOCATION );
position = rulerNormal->GetPositionFromPage(1, volume, true);
DALI_TEST_EQUALS( position, 35.0f, TEST_LOCATION );
DALI_TEST_EQUALS( volume, 0u, TEST_LOCATION );
- position = rulerZero->GetPositionFromPage(2, volume, true);
- DALI_TEST_EQUALS( position, 10.0f, TEST_LOCATION );
- DALI_TEST_EQUALS( volume, 2u, TEST_LOCATION );
-
position = rulerNormal->GetPositionFromPage(2, volume, true);
DALI_TEST_EQUALS( position, 60.0f, TEST_LOCATION );
DALI_TEST_EQUALS( volume, 0u, TEST_LOCATION );
position = rulerNormal->GetPositionFromPage(2, volume, true);
DALI_TEST_EQUALS( position, 60.0f, TEST_LOCATION );
DALI_TEST_EQUALS( volume, 0u, TEST_LOCATION );