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-GaussianBlurView.cpp;h=4a19b7844d4b5f9651d2878e45c1f4e6e9fb0bb4;hp=f3f6f77eb665d83be7bc9d666fbd552a36b54656;hb=8db599ebe35a704d4adfd70040c33ce8e31e8d64;hpb=bc96db3d2013dbc71df9bb97ec14159c1afddb31 diff --git a/automated-tests/src/dali-toolkit/utc-Dali-GaussianBlurView.cpp b/automated-tests/src/dali-toolkit/utc-Dali-GaussianBlurView.cpp index f3f6f77..4a19b78 100644 --- a/automated-tests/src/dali-toolkit/utc-Dali-GaussianBlurView.cpp +++ b/automated-tests/src/dali-toolkit/utc-Dali-GaussianBlurView.cpp @@ -1,5 +1,5 @@ /* - * Copyright (c) 2014 Samsung Electronics Co., Ltd. + * Copyright (c) 2016 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. @@ -19,13 +19,14 @@ #include #include #include +#include using namespace Dali; using namespace Dali::Toolkit; namespace { -const char* TEST_IMAGE_FILE_NAME = "gallery_image_01.jpg"; +const char* TEST_IMAGE_FILE_NAME = TEST_RESOURCE_DIR "/gallery-small-1.jpg"; } // namespace void utc_gaussian_blur_view_startup(void) @@ -215,8 +216,12 @@ int UtcDaliGaussianBlurViewSetGetRenderTarget(void) Stage::GetCurrent().Add(view); view.Activate(); - FrameBufferImage renderTarget = FrameBufferImage::New( 480.0f, 800.0f, Pixel::RGB888 ); - view.SetUserImageAndOutputRenderTarget(ResourceImage::New(TEST_IMAGE_FILE_NAME), renderTarget); + PixelData pixels = Toolkit::SyncImageLoader::Load( TEST_IMAGE_FILE_NAME ); + Texture texture = Texture::New( TextureType::TEXTURE_2D, pixels.GetPixelFormat(), pixels.GetWidth(), pixels.GetHeight() ); + texture.Upload( pixels, 0, 0, 0, 0, pixels.GetWidth(), pixels.GetHeight() ); + + FrameBuffer renderTarget = FrameBuffer::New( 480, 800, FrameBuffer::Attachment::NONE ); + view.SetUserImageAndOutputRenderTarget(texture, renderTarget); DALI_TEST_CHECK( view.GetBlurredRenderTarget() == renderTarget ); END_TEST; } @@ -248,7 +253,7 @@ int UtcDaliGaussianBlurViewActivateOnce(void) int UtcDaliGaussianBlurViewFinishedSignalN(void) { ToolkitTestApplication application; - tet_infoline("UtcDaliGaussianBlurViewSetGetRenderTarget"); + tet_infoline("UtcDaliGaussianBlurViewFinishedSignalN"); Toolkit::GaussianBlurView view = Toolkit::GaussianBlurView::New(5, 1.5f, Pixel::RGB888, 0.5f, 0.5f, true); DALI_TEST_CHECK( view );