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
Fixed an issue where the multi-tap did not work properly.
[platform/core/uifw/dali-toolkit.git]
/
automated-tests
/
src
/
dali-toolkit
/
utc-Dali-AnimatedImageVisual.cpp
diff --git
a/automated-tests/src/dali-toolkit/utc-Dali-AnimatedImageVisual.cpp
b/automated-tests/src/dali-toolkit/utc-Dali-AnimatedImageVisual.cpp
index
c77b4ac
..
6d74b7c
100644
(file)
--- a/
automated-tests/src/dali-toolkit/utc-Dali-AnimatedImageVisual.cpp
+++ b/
automated-tests/src/dali-toolkit/utc-Dali-AnimatedImageVisual.cpp
@@
-90,9
+90,9
@@
int UtcDaliAnimatedImageVisualGetPropertyMap01(void)
DALI_TEST_CHECK( value );
DALI_TEST_CHECK( value->Get<std::string>() == TEST_GIF_FILE_NAME );
DALI_TEST_CHECK( value );
DALI_TEST_CHECK( value->Get<std::string>() == TEST_GIF_FILE_NAME );
- value = resultMap.Find( DevelVisual::Property::CORNER_RADIUS, Property::
FLOAT
);
+ value = resultMap.Find( DevelVisual::Property::CORNER_RADIUS, Property::
VECTOR4
);
DALI_TEST_CHECK( value );
DALI_TEST_CHECK( value );
- DALI_TEST_EQUALS( value->Get<
float>(), 22.2f
, TEST_LOCATION );
+ DALI_TEST_EQUALS( value->Get<
Vector4>(), Vector4(22.2f, 22.2f, 22.2f, 22.2f)
, TEST_LOCATION );
value = resultMap.Find( Toolkit::DevelVisual::Property::CORNER_RADIUS_POLICY, Property::INTEGER );
DALI_TEST_CHECK( value );
value = resultMap.Find( Toolkit::DevelVisual::Property::CORNER_RADIUS_POLICY, Property::INTEGER );
DALI_TEST_CHECK( value );
@@
-136,7
+136,7
@@
int UtcDaliAnimatedImageVisualGetPropertyMap02(void)
.Add( "pixelArea", Vector4() )
.Add( "wrapModeU", WrapMode::REPEAT )
.Add( "wrapModeV", WrapMode::DEFAULT )
.Add( "pixelArea", Vector4() )
.Add( "wrapModeU", WrapMode::REPEAT )
.Add( "wrapModeV", WrapMode::DEFAULT )
- .Add( "cornerRadius",
50.0f
)
+ .Add( "cornerRadius",
Vector4(50.0f, 25.0f, 12.5f, 33.0f)
)
.Add( "cornerRadiusPolicy", Visual::Transform::Policy::RELATIVE ));
Property::Map resultMap;
.Add( "cornerRadiusPolicy", Visual::Transform::Policy::RELATIVE ));
Property::Map resultMap;
@@
-174,7
+174,7
@@
int UtcDaliAnimatedImageVisualGetPropertyMap02(void)
value = resultMap.Find( Toolkit::DevelVisual::Property::CORNER_RADIUS, "cornerRadius" );
DALI_TEST_CHECK( value );
value = resultMap.Find( Toolkit::DevelVisual::Property::CORNER_RADIUS, "cornerRadius" );
DALI_TEST_CHECK( value );
- DALI_TEST_EQUALS( value->Get<
float>(), 50.0f
, TEST_LOCATION );
+ DALI_TEST_EQUALS( value->Get<
Vector4>(), Vector4(50.0f, 25.0f, 12.5f, 33.0f)
, TEST_LOCATION );
value = resultMap.Find( Toolkit::DevelVisual::Property::CORNER_RADIUS_POLICY, "cornerRadiusPolicy" );
DALI_TEST_CHECK( value );
value = resultMap.Find( Toolkit::DevelVisual::Property::CORNER_RADIUS_POLICY, "cornerRadiusPolicy" );
DALI_TEST_CHECK( value );
@@
-242,7
+242,7
@@
int UtcDaliAnimatedImageVisualGetPropertyMap03(void)
value = resultMap.Find( Toolkit::DevelVisual::Property::CORNER_RADIUS, "cornerRadius" );
DALI_TEST_CHECK( value );
value = resultMap.Find( Toolkit::DevelVisual::Property::CORNER_RADIUS, "cornerRadius" );
DALI_TEST_CHECK( value );
- DALI_TEST_EQUALS( value->Get<
float>(), 50.5f
, TEST_LOCATION );
+ DALI_TEST_EQUALS( value->Get<
Vector4>(), Vector4(50.5f, 50.5f, 50.5f, 50.5f)
, TEST_LOCATION );
value = resultMap.Find( Toolkit::DevelVisual::Property::CORNER_RADIUS_POLICY, "cornerRadiusPolicy" );
DALI_TEST_CHECK( value );
value = resultMap.Find( Toolkit::DevelVisual::Property::CORNER_RADIUS_POLICY, "cornerRadiusPolicy" );
DALI_TEST_CHECK( value );