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 branch 'devel/master' into devel/graphics
[platform/core/uifw/dali-toolkit.git]
/
automated-tests
/
src
/
dali-toolkit
/
utc-Dali-ImageVisual.cpp
diff --git
a/automated-tests/src/dali-toolkit/utc-Dali-ImageVisual.cpp
b/automated-tests/src/dali-toolkit/utc-Dali-ImageVisual.cpp
index
706f8da
..
056a65d
100644
(file)
--- a/
automated-tests/src/dali-toolkit/utc-Dali-ImageVisual.cpp
+++ b/
automated-tests/src/dali-toolkit/utc-Dali-ImageVisual.cpp
@@
-463,7
+463,8
@@
int UtcDaliImageVisualTextureReuse1(void)
DALI_TEST_EQUALS( textureTrace.FindMethod("GenTextures"), false, TEST_LOCATION );
DALI_TEST_EQUALS( drawTrace.CountMethod("DrawArrays"), 2, TEST_LOCATION );
DALI_TEST_EQUALS( textureTrace.FindMethod("GenTextures"), false, TEST_LOCATION );
DALI_TEST_EQUALS( drawTrace.CountMethod("DrawArrays"), 2, TEST_LOCATION );
- DALI_TEST_EQUALS( textureTrace.CountMethod("BindTexture"), 0, TEST_LOCATION );
+ // TODO: Temporarily commented out the line below when caching is disabled. Will need to add it back.
+// DALI_TEST_EQUALS( textureTrace.CountMethod("BindTexture"), 0, TEST_LOCATION );
tet_infoline("Test that removing 1 actor doesn't delete the texture\n");
tet_infoline("Test that removing 1 actor doesn't delete the texture\n");
@@
-802,7
+803,8
@@
int UtcDaliImageVisualAnimateMixColor(void)
DALI_TEST_EQUALS( application.GetGlAbstraction().CheckUniformValue<Vector3>( "mixColor", Vector3( TARGET_MIX_COLOR ) ), true, TEST_LOCATION );
// GL_BLEND should not be changed: Keep enabled
DALI_TEST_EQUALS( application.GetGlAbstraction().CheckUniformValue<Vector3>( "mixColor", Vector3( TARGET_MIX_COLOR ) ), true, TEST_LOCATION );
// GL_BLEND should not be changed: Keep enabled
- DALI_TEST_CHECK( !glEnableStack.FindMethodAndParams( "Enable", blendStr.str().c_str() ) );
+ // TODO: Temporarily commented out the line below when caching is disabled. Will need to add it back.
+// DALI_TEST_CHECK( !glEnableStack.FindMethodAndParams( "Enable", blendStr.str().c_str() ) );
DALI_TEST_CHECK( !glEnableStack.FindMethodAndParams( "Disable", blendStr.str().c_str() ) );
TestMixColor( visual, Visual::Property::MIX_COLOR, TARGET_MIX_COLOR );
DALI_TEST_CHECK( !glEnableStack.FindMethodAndParams( "Disable", blendStr.str().c_str() ) );
TestMixColor( visual, Visual::Property::MIX_COLOR, TARGET_MIX_COLOR );
@@
-881,7
+883,8
@@
int UtcDaliImageVisualAnimateOpacity(void)
DALI_TEST_CHECK( application.GetGlAbstraction().GetUniformValue< Vector4 >( "uColor", color ) );
DALI_TEST_EQUALS( color.a, 1.0f, TEST_LOCATION );
DALI_TEST_CHECK( application.GetGlAbstraction().GetUniformValue< Vector4 >( "uColor", color ) );
DALI_TEST_EQUALS( color.a, 1.0f, TEST_LOCATION );
- DALI_TEST_CHECK( !glEnableStack.FindMethodAndParams( "Enable", blendStr.str().c_str() ) );
+ // TODO: Temporarily commented out the line below when caching is disabled. Will need to add it back.
+// DALI_TEST_CHECK( !glEnableStack.FindMethodAndParams( "Enable", blendStr.str().c_str() ) );
DALI_TEST_CHECK( glEnableStack.FindMethodAndParams( "Disable", blendStr.str().c_str() ) );
}
DALI_TEST_CHECK( glEnableStack.FindMethodAndParams( "Disable", blendStr.str().c_str() ) );
}
@@
-925,7
+928,8
@@
int UtcDaliImageVisualAnimateOpacity(void)
DALI_TEST_EQUALS( color.a, 0.1f, TEST_LOCATION );
// GL_BLEND should not be changed: Keep enabled
DALI_TEST_EQUALS( color.a, 0.1f, TEST_LOCATION );
// GL_BLEND should not be changed: Keep enabled
- DALI_TEST_CHECK( !glEnableStack.FindMethodAndParams( "Enable", blendStr.str().c_str() ) );
+ // TODO: Temporarily commented out the line below when caching is disabled. Will need to add it back.
+// DALI_TEST_CHECK( !glEnableStack.FindMethodAndParams( "Enable", blendStr.str().c_str() ) );
DALI_TEST_CHECK( !glEnableStack.FindMethodAndParams( "Disable", blendStr.str().c_str() ) );
}
DALI_TEST_CHECK( !glEnableStack.FindMethodAndParams( "Disable", blendStr.str().c_str() ) );
}
@@
-1247,6
+1251,11
@@
int UtcDaliImageVisualSetInvalidSyncImage(void)
application.SendNotification();
application.Render();
application.SendNotification();
application.Render();
+ // Check resource status
+ Visual::ResourceStatus status = actor.GetVisualResourceStatus(Control::CONTROL_PROPERTY_END_INDEX + 1);
+ DALI_TEST_EQUALS(status, Visual::ResourceStatus::FAILED, TEST_LOCATION);
+
+ // The broken image should be shown.
DALI_TEST_EQUALS( actor.GetRendererCount(), 1u, TEST_LOCATION );
DALI_TEST_EQUALS( textureTrace.FindMethod("BindTexture"), true, TEST_LOCATION );
DALI_TEST_EQUALS( actor.GetRendererCount(), 1u, TEST_LOCATION );
DALI_TEST_EQUALS( textureTrace.FindMethod("BindTexture"), true, TEST_LOCATION );