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
Corner Radius become Vector4
[platform/core/uifw/dali-toolkit.git]
/
automated-tests
/
src
/
dali-toolkit
/
utc-Dali-AnimatedVectorImageVisual.cpp
diff --git
a/automated-tests/src/dali-toolkit/utc-Dali-AnimatedVectorImageVisual.cpp
b/automated-tests/src/dali-toolkit/utc-Dali-AnimatedVectorImageVisual.cpp
index
b692ebb
..
dfd0b72
100644
(file)
--- a/
automated-tests/src/dali-toolkit/utc-Dali-AnimatedVectorImageVisual.cpp
+++ b/
automated-tests/src/dali-toolkit/utc-Dali-AnimatedVectorImageVisual.cpp
@@
-172,7
+172,7
@@
int UtcDaliVisualFactoryGetAnimatedVectorImageVisual04(void)
tet_infoline( "UtcDaliVisualFactoryGetAnimatedVectorImageVisual04: Request animated vector image visual with a Property::Map" );
int startFrame = 1, endFrame = 3;
tet_infoline( "UtcDaliVisualFactoryGetAnimatedVectorImageVisual04: Request animated vector image visual with a Property::Map" );
int startFrame = 1, endFrame = 3;
- float cornerRadius =
50
.0f;
+ float cornerRadius =
22
.0f;
Property::Array playRange;
playRange.PushBack( startFrame );
playRange.PushBack( endFrame );
Property::Array playRange;
playRange.PushBack( startFrame );
playRange.PushBack( endFrame );
@@
-241,9
+241,9
@@
int UtcDaliVisualFactoryGetAnimatedVectorImageVisual04(void)
DALI_TEST_CHECK( value );
DALI_TEST_CHECK( value->Get< bool >() == false );
DALI_TEST_CHECK( value );
DALI_TEST_CHECK( value->Get< bool >() == false );
- 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 >(), cornerRadius
, TEST_LOCATION );
+ DALI_TEST_EQUALS( value->Get<
Vector4 >(), Vector4(cornerRadius, cornerRadius, cornerRadius, cornerRadius)
, TEST_LOCATION );
value = resultMap.Find( DevelVisual::Property::CORNER_RADIUS_POLICY, "cornerRadiusPolicy" );
DALI_TEST_CHECK( value );
value = resultMap.Find( DevelVisual::Property::CORNER_RADIUS_POLICY, "cornerRadiusPolicy" );
DALI_TEST_CHECK( value );
@@
-261,7
+261,7
@@
int UtcDaliAnimatedVectorImageVisualGetPropertyMap01(void)
tet_infoline( "UtcDaliAnimatedVectorImageVisualGetPropertyMap01" );
int startFrame = 1, endFrame = 3;
tet_infoline( "UtcDaliAnimatedVectorImageVisualGetPropertyMap01" );
int startFrame = 1, endFrame = 3;
-
float cornerRadius = 50.0f
;
+
Vector4 cornerRadius(50.0f, 22.0f, 0.0f, 3.0f)
;
Property::Array playRange;
playRange.PushBack( startFrame );
playRange.PushBack( endFrame );
Property::Array playRange;
playRange.PushBack( startFrame );
playRange.PushBack( endFrame );
@@
-332,9
+332,9
@@
int UtcDaliAnimatedVectorImageVisualGetPropertyMap01(void)
DALI_TEST_CHECK( value );
DALI_TEST_CHECK( value->Get< bool >() == true ); // Check default value
DALI_TEST_CHECK( value );
DALI_TEST_CHECK( value->Get< bool >() == true ); // Check default value
- 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
>(), cornerRadius, TEST_LOCATION );
+ DALI_TEST_EQUALS( value->Get<
Vector4
>(), cornerRadius, TEST_LOCATION );
value = resultMap.Find( DevelVisual::Property::CORNER_RADIUS_POLICY, "cornerRadiusPolicy" );
DALI_TEST_CHECK( value );
value = resultMap.Find( DevelVisual::Property::CORNER_RADIUS_POLICY, "cornerRadiusPolicy" );
DALI_TEST_CHECK( value );