X-Git-Url: http://review.tizen.org/git/?p=platform%2Fcore%2Fuifw%2Fdali-toolkit.git;a=blobdiff_plain;f=automated-tests%2Fsrc%2Fdali-toolkit%2Futc-Dali-BubbleEmitter.cpp;h=7fa50ed2f3be8b263786e7109c60405f0ccf8e42;hp=b5a0d5fcd00ae8427571d3731f1f71547f69fe0b;hb=538e266eef5a998be3d6d4b6e1019ecd313d59d4;hpb=b8da2e53925b9abb9fa362560069e8ca4aa62f81 diff --git a/automated-tests/src/dali-toolkit/utc-Dali-BubbleEmitter.cpp b/automated-tests/src/dali-toolkit/utc-Dali-BubbleEmitter.cpp index b5a0d5f..7fa50ed 100644 --- a/automated-tests/src/dali-toolkit/utc-Dali-BubbleEmitter.cpp +++ b/automated-tests/src/dali-toolkit/utc-Dali-BubbleEmitter.cpp @@ -193,6 +193,14 @@ int UtcDaliBubbleEmitterSetBubbleScale(void) ToolkitTestApplication application; tet_infoline( " UtcDaliBubbleEmitterSetBubbleScale " ); + static std::vector customUniforms = + { + UniformData("uDynamicScale", Property::Type::FLOAT), + }; + + TestGraphicsController& graphics = application.GetGraphicsController(); + graphics.AddCustomUniforms(customUniforms); + Texture shapeImage = CreateSolidColorTexture( application, Color::GREEN, 5, 5 ); BubbleEmitter emitter = BubbleEmitter::New( Vector2(50.f,50.f),shapeImage, 150, Vector2( 5.f, 10.f )); DALI_TEST_CHECK(emitter); @@ -313,9 +321,19 @@ int UtcDaliBubbleEmitterEmitBubble(void) int UtcDaliBubbleEmitterRestore(void) { +#ifdef OLD_GRAPHICS_TEST ToolkitTestApplication application; tet_infoline( " UtcDaliBubbleEmitterRestore " ); + static std::vector customUniforms = + { + UniformData("uPercentage[0]", Property::Type::FLOAT), + UniformData("uStartEndPosition[0]", Property::Type::VECTOR4), + }; + + TestGraphicsController& graphics = application.GetGraphicsController(); + graphics.AddCustomUniforms(customUniforms); + Vector2 movementArea(50.f,50.f); Texture shapeImage = CreateSolidColorTexture( application, Color::GREEN, 5, 5 ); BubbleEmitter emitter = BubbleEmitter::New( movementArea,shapeImage, 90, Vector2( 5.f, 10.f )); @@ -365,6 +383,9 @@ int UtcDaliBubbleEmitterRestore(void) DALI_TEST_CHECK( gl.GetUniformValue( "uStartEndPosition[0]", startEndPosValue ) ); DALI_TEST_EQUALS( startEndPosValue, Vector4::ZERO, TEST_LOCATION ); +#else + tet_result(TET_PASS); +#endif END_TEST; }