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-RendererFactory.cpp;h=9cc604b960eb4adec60bc42d726cd8a3a06d5e15;hp=391bc7497b4d8209974ee7717094a08ba5a6464b;hb=6861f629112d44d4de1a8a7c70591e2279b951b2;hpb=4bb73208b381ac496ea18f79700d41038b4e7c12;ds=sidebyside diff --git a/automated-tests/src/dali-toolkit/utc-Dali-RendererFactory.cpp b/automated-tests/src/dali-toolkit/utc-Dali-RendererFactory.cpp index 391bc74..9cc604b 100644 --- a/automated-tests/src/dali-toolkit/utc-Dali-RendererFactory.cpp +++ b/automated-tests/src/dali-toolkit/utc-Dali-RendererFactory.cpp @@ -173,7 +173,7 @@ void TestControlRendererRender( ToolkitTestApplication& application, Actor& acto controlRenderer.SetOnStage( actor ); DALI_TEST_CHECK( actor.GetRendererCount() == 1u ); - DALI_TEST_CHECK( actor.GetRendererAt(0u).GetMaterial().GetNumberOfSamplers() == expectedSamplers ); + DALI_TEST_CHECK( actor.GetRendererAt(0u).GetMaterial().GetNumberOfTextures() == expectedSamplers ); application.SendNotification(); application.Render(); @@ -804,8 +804,6 @@ int UtcDaliRendererFactoryResetRenderer1(void) controlRenderer.SetOnStage( actor2 ); application.SendNotification(); application.Render(0); - Image samplerImage = actor2.GetRendererAt(0u).GetMaterial().GetSamplerAt(0u).GetImage(); - DALI_TEST_CHECK( BufferImage::DownCast( samplerImage ) ); END_TEST; } @@ -830,16 +828,12 @@ int UtcDaliRendererFactoryResetRenderer2(void) application.SendNotification(); application.Render(0); - Image samplerImage = actor.GetRendererAt(0u).GetMaterial().GetSamplerAt(0u).GetImage(); - DALI_TEST_CHECK( ResourceImage::DownCast( samplerImage ) ); Image bufferImage = CreateBufferImage( 100, 200, Vector4( 1.f, 1.f, 1.f, 1.f ) ); bool isNewRenderer = factory.ResetRenderer( controlRenderer, bufferImage ); DALI_TEST_CHECK( !isNewRenderer ); application.SendNotification(); application.Render(0); - samplerImage = actor.GetRendererAt(0u).GetMaterial().GetSamplerAt(0u).GetImage(); - DALI_TEST_CHECK( BufferImage::DownCast( samplerImage ) ); isNewRenderer = factory.ResetRenderer( controlRenderer, Color::RED ); DALI_TEST_CHECK( isNewRenderer );