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=1c464557384923489074edf79585d5a17cc0fdb7;hb=538e266eef5a998be3d6d4b6e1019ecd313d59d4;hpb=946461ac1b49e996d9155c95130ec5aa1b08f77d diff --git a/automated-tests/src/dali-toolkit/utc-Dali-BubbleEmitter.cpp b/automated-tests/src/dali-toolkit/utc-Dali-BubbleEmitter.cpp index 1c46455..7fa50ed 100644 --- a/automated-tests/src/dali-toolkit/utc-Dali-BubbleEmitter.cpp +++ b/automated-tests/src/dali-toolkit/utc-Dali-BubbleEmitter.cpp @@ -1,5 +1,5 @@ /* - * Copyright (c) 2020 Samsung Electronics Co., Ltd. + * Copyright (c) 2021 Samsung Electronics Co., Ltd. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -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); @@ -259,7 +267,7 @@ int UtcDaliBubbleEmitterSetBubbleDensity02(void) catch(Dali::DaliException& e) { DALI_TEST_PRINT_ASSERT( e ); - DALI_TEST_ASSERT(e, "density>0 && density<=9", TEST_LOCATION ); + DALI_TEST_ASSERT(e, "density > 0 && density <= 9", TEST_LOCATION ); } END_TEST; } @@ -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; }