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
Merge "Revert "Added tag for capture privilege"" into devel/master
[platform/core/uifw/dali-toolkit.git]
/
automated-tests
/
src
/
dali-toolkit
/
utc-Dali-ImageView.cpp
diff --git
a/automated-tests/src/dali-toolkit/utc-Dali-ImageView.cpp
b/automated-tests/src/dali-toolkit/utc-Dali-ImageView.cpp
index
a770a77
..
c9cbdc5
100644
(file)
--- a/
automated-tests/src/dali-toolkit/utc-Dali-ImageView.cpp
+++ b/
automated-tests/src/dali-toolkit/utc-Dali-ImageView.cpp
@@
-366,7
+366,7
@@
int UtcDaliImageViewSetGetProperty03(void)
DALI_TEST_CHECK( srcFactorRgb == BlendFactor::ONE );
DALI_TEST_CHECK( destFactorRgb == BlendFactor::ONE_MINUS_SRC_ALPHA );
DALI_TEST_CHECK( srcFactorAlpha == BlendFactor::ONE );
DALI_TEST_CHECK( srcFactorRgb == BlendFactor::ONE );
DALI_TEST_CHECK( destFactorRgb == BlendFactor::ONE_MINUS_SRC_ALPHA );
DALI_TEST_CHECK( srcFactorAlpha == BlendFactor::ONE );
- DALI_TEST_CHECK( destFactorAlpha == BlendFactor::ONE );
+ DALI_TEST_CHECK( destFactorAlpha == BlendFactor::ONE
_MINUS_SRC_ALPHA
);
value = renderer.GetProperty( Renderer::Property::BLEND_PRE_MULTIPLIED_ALPHA );
DALI_TEST_CHECK( value.Get( enable ) );
value = renderer.GetProperty( Renderer::Property::BLEND_PRE_MULTIPLIED_ALPHA );
DALI_TEST_CHECK( value.Get( enable ) );
@@
-489,6
+489,12
@@
int UtcDaliImageViewAsyncLoadingWithAtlasing(void)
application.Render(16);
application.SendNotification();
application.Render(16);
application.SendNotification();
+ imageView.SetProperty( Dali::Actor::Property::LAYOUT_DIRECTION, Dali::LayoutDirection::RIGHT_TO_LEFT );
+ application.SendNotification();
+ application.Render(16);
+ application.Render(16);
+ application.SendNotification();
+
// loading started, this waits for the loader thread for max 30 seconds
DALI_TEST_EQUALS( Test::WaitForEventThreadTrigger( 1 ), true, TEST_LOCATION );
// loading started, this waits for the loader thread for max 30 seconds
DALI_TEST_EQUALS( Test::WaitForEventThreadTrigger( 1 ), true, TEST_LOCATION );
@@
-1520,7
+1526,7
@@
int UtcDaliImageViewResourceReadySignalWithImmediateLoad(void)
Property::Map imageMap;
imageMap[ ImageVisual::Property::URL ] = gImage_34_RGBA;
Property::Map imageMap;
imageMap[ ImageVisual::Property::URL ] = gImage_34_RGBA;
- imageMap[
DevelImageVisual::Property::LOAD_POLICY ] = Devel
ImageVisual::LoadPolicy::IMMEDIATE;
+ imageMap[
ImageVisual::Property::LOAD_POLICY ] =
ImageVisual::LoadPolicy::IMMEDIATE;
tet_infoline("Creating ImageView without URL so image does not start loading");
ImageView imageView = ImageView::New();
tet_infoline("Creating ImageView without URL so image does not start loading");
ImageView imageView = ImageView::New();
@@
-1551,7
+1557,7
@@
int UtcDaliImageViewResourceReadySignalWithReusedImage(void)
Property::Map imageMap;
imageMap[ ImageVisual::Property::URL ] = gImage_34_RGBA;
Property::Map imageMap;
imageMap[ ImageVisual::Property::URL ] = gImage_34_RGBA;
- imageMap[
DevelImageVisual::Property::LOAD_POLICY ] = Devel
ImageVisual::LoadPolicy::IMMEDIATE;
+ imageMap[
ImageVisual::Property::LOAD_POLICY ] =
ImageVisual::LoadPolicy::IMMEDIATE;
ImageView imageView = ImageView::New();
imageView.ResourceReadySignal().Connect( &ResourceReadySignal);
ImageView imageView = ImageView::New();
imageView.ResourceReadySignal().Connect( &ResourceReadySignal);
@@
-1585,7
+1591,7
@@
int UtcDaliImageViewResourceReadySignalWithReusedImage02(void)
Property::Map imageImmediateLoadingMap;
imageImmediateLoadingMap[ ImageVisual::Property::URL ] = gImage_34_RGBA;
Property::Map imageImmediateLoadingMap;
imageImmediateLoadingMap[ ImageVisual::Property::URL ] = gImage_34_RGBA;
- imageImmediateLoadingMap[
DevelImageVisual::Property::LOAD_POLICY ] = Devel
ImageVisual::LoadPolicy::IMMEDIATE;
+ imageImmediateLoadingMap[
ImageVisual::Property::LOAD_POLICY ] =
ImageVisual::LoadPolicy::IMMEDIATE;
tet_infoline("Immediate load an image");
ImageView imageView = ImageView::New();
tet_infoline("Immediate load an image");
ImageView imageView = ImageView::New();