X-Git-Url: http://review.tizen.org/git/?p=platform%2Fcore%2Fuifw%2Fdali-core.git;a=blobdiff_plain;f=automated-tests%2Fsrc%2Fdali%2Futc-Dali-Shader.cpp;h=dacfd96dd0ec217c4906da390646e705e856ec1a;hp=cf419bea7a6fa66b2fac1381397697653c5ece7a;hb=72d3e464f0fdaaf6db6206873408e8d845f02cd4;hpb=db93e9c305ec5f37c475ce27cb5cf12a99a6a296 diff --git a/automated-tests/src/dali/utc-Dali-Shader.cpp b/automated-tests/src/dali/utc-Dali-Shader.cpp index cf419be..dacfd96 100644 --- a/automated-tests/src/dali/utc-Dali-Shader.cpp +++ b/automated-tests/src/dali/utc-Dali-Shader.cpp @@ -19,6 +19,7 @@ #include #include +#include #include #include @@ -145,15 +146,15 @@ int UtcDaliShaderConstraint01(void) application.Render(0); // Expect no blue component in either buffer - yellow - DALI_TEST_EQUALS( shader.GetCurrentProperty< Vector4 >( colorIndex ), Color::YELLOW, TEST_LOCATION ); + DALI_TEST_EQUALS( DevelHandle::GetCurrentProperty< Vector4 >( shader, colorIndex ), Color::YELLOW, TEST_LOCATION ); application.Render(0); - DALI_TEST_EQUALS( shader.GetCurrentProperty< Vector4 >( colorIndex ), Color::YELLOW, TEST_LOCATION ); + DALI_TEST_EQUALS( DevelHandle::GetCurrentProperty< Vector4 >( shader, colorIndex ), Color::YELLOW, TEST_LOCATION ); shader.RemoveConstraints(); shader.SetProperty(colorIndex, Color::WHITE ); application.SendNotification(); application.Render(0); - DALI_TEST_EQUALS( shader.GetCurrentProperty< Vector4 >( colorIndex ), Color::WHITE, TEST_LOCATION ); + DALI_TEST_EQUALS( DevelHandle::GetCurrentProperty< Vector4 >( shader, colorIndex ), Color::WHITE, TEST_LOCATION ); END_TEST; } @@ -244,11 +245,11 @@ int UtcDaliShaderAnimatedProperty01(void) application.SendNotification(); application.Render(500); - DALI_TEST_EQUALS( shader.GetCurrentProperty< Vector4 >( colorIndex ), Color::WHITE * 0.5f, TEST_LOCATION ); + DALI_TEST_EQUALS( DevelHandle::GetCurrentProperty< Vector4 >( shader, colorIndex ), Color::WHITE * 0.5f, TEST_LOCATION ); application.Render(500); - DALI_TEST_EQUALS( shader.GetCurrentProperty< Vector4 >( colorIndex ), Color::TRANSPARENT, TEST_LOCATION ); + DALI_TEST_EQUALS( DevelHandle::GetCurrentProperty< Vector4 >( shader, colorIndex ), Color::TRANSPARENT, TEST_LOCATION ); END_TEST; } @@ -330,7 +331,7 @@ int UtcDaliShaderProgramProperty(void) DALI_TEST_CHECK( f == FragmentSource ); DALI_TEST_CHECK( h == hintSet ); - value = shader.GetCurrentProperty( Shader::Property::PROGRAM ); + value = DevelHandle::GetCurrentProperty( shader, Shader::Property::PROGRAM ); DALI_TEST_CHECK( value.GetType() == Property::MAP); outMap = value.GetMap();