/*
- * 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.
#include <algorithm>
#include <stdlib.h>
#include <dali/public-api/dali-core.h>
+#include <dali/integration-api/bitmap.h>
#include <dali-test-suite-utils.h>
#include <test-native-image.h>
static const char* gTestImageFilename = "icon_wrt.png";
-
-// 1.1
-int UtcDaliImageNew01(void)
-{
- TestApplication application;
-
- tet_infoline("UtcDaliImageNew01 - Image::New(const std::string&)");
-
- // invoke default handle constructor
- Image image;
-
- DALI_TEST_CHECK( !image );
-
- // initialise handle
- image = ResourceImage::New(gTestImageFilename);
-
- DALI_TEST_CHECK( image );
- END_TEST;
-}
-
-// 1.2
-int UtcDaliImageNew02(void)
-{
- TestApplication application;
-
- tet_infoline("UtcDaliImageNew02 - Image::New(const std::string&, const ImageAttributes&)");
-
- // invoke default handle constructor
- Image image;
-
- DALI_TEST_CHECK( !image );
-
- // initialise handle
- Dali::ImageAttributes imageAttributes;
- imageAttributes.SetSize(128, 256);
- imageAttributes.SetScalingMode(Dali::ImageAttributes::FitHeight);
- image = ResourceImage::New(gTestImageFilename, imageAttributes);
-
- DALI_TEST_CHECK( image );
- END_TEST;
-}
-
-// 1.3
-int UtcDaliImageNew03(void)
-{
- TestApplication application;
-
- tet_infoline("UtcDaliImageNew03 - Image::New(NativeImage&)");
-
- // invoke default handle constructor
- Image image;
- TestNativeImagePointer nativeImage = TestNativeImage::New(16, 16);
-
- DALI_TEST_CHECK( !image );
-
- // initialise handle
- image = Image::New(*(nativeImage.Get()));
-
- DALI_TEST_CHECK( image );
- END_TEST;
-}
-
-// 1.4
-int UtcDaliImageNewWithPolicies01(void)
-{
- TestApplication application;
-
- // testing delayed loading
- tet_infoline("UtcDaliImageNewWithPolicies01 - Load image with LoadPolicy::OnDemand, ReleasePolicy::Never");
- DALI_TEST_CHECK( !application.GetPlatform().WasCalled(TestPlatformAbstraction::LoadResourceFunc) );
- Image image = ResourceImage::New(gTestImageFilename, ResourceImage::ON_DEMAND, Image::NEVER);
-
- DALI_TEST_CHECK( image );
-
- application.SendNotification();
- application.Render(16);
-
- // request file loading only when actor added to stage
- DALI_TEST_CHECK( !application.GetPlatform().WasCalled(TestPlatformAbstraction::LoadResourceFunc) );
-
- ImageActor actor = ImageActor::New(image);
-
- Stage::GetCurrent().Add(actor);
-
- application.SendNotification();
- application.Render(16);
-
- DALI_TEST_CHECK( application.GetPlatform().WasCalled(TestPlatformAbstraction::LoadResourceFunc) );
-
- // testing ReleasePolicy::Never
- // fake loading image
- std::vector<GLuint> ids;
- ids.push_back( 23 );
- application.GetGlAbstraction().SetNextTextureIds( ids );
- Integration::ResourceRequest* request = application.GetPlatform().GetRequest();
- Integration::Bitmap* bitmap = Integration::Bitmap::New( Integration::Bitmap::BITMAP_2D_PACKED_PIXELS, ResourcePolicy::DISCARD );
- Integration::ResourcePointer resource(bitmap);
- bitmap->GetPackedPixelsProfile()->ReserveBuffer(Pixel::RGBA8888, 80, 80, 80, 80);
-
- if(request)
- {
- application.GetPlatform().SetResourceLoaded(request->GetId(), request->GetType()->id, resource);
- }
- application.Render(16);
- application.SendNotification();
-
- DALI_TEST_CHECK ( !application.GetGlAbstraction().CheckTextureDeleted(23) );
-
- // never discard texture
- Stage::GetCurrent().Remove(actor);
- application.Render(16);
- application.SendNotification();
- application.Render(16);
- application.SendNotification();
- DALI_TEST_CHECK ( !application.GetGlAbstraction().CheckTextureDeleted(23) );
- END_TEST;
-}
-
-// 1.5
-int UtcDaliImageNewWithPolicies02(void)
+namespace
{
- TestApplication application;
- const Vector2 closestImageSize( 80, 45);
- application.GetPlatform().SetClosestImageSize(closestImageSize);
-
- // testing resource deletion when taken off stage
- tet_infoline("UtcDaliImageNewWithPolicies02 - Load image with LoadPolicy::OnDemand, ReleasePolicy::Unused");
-
- Image image = ResourceImage::New(gTestImageFilename, ResourceImage::ON_DEMAND, Image::UNUSED);
-
- DALI_TEST_CHECK( image );
-
- application.SendNotification();
- application.Render(16);
-
- // request file loading only when actor added to stage
- DALI_TEST_CHECK( !application.GetPlatform().WasCalled(TestPlatformAbstraction::LoadResourceFunc) );
-
- ImageActor actor = ImageActor::New(image);
-
- Stage::GetCurrent().Add(actor);
-
- application.SendNotification();
- application.Render(16);
-
- DALI_TEST_CHECK( application.GetPlatform().WasCalled(TestPlatformAbstraction::LoadResourceFunc) );
-
- // testing ReleasePolicy::Unused
- // fake loading image
- std::vector<GLuint> ids;
- ids.push_back( 23 );
- application.GetGlAbstraction().SetNextTextureIds( ids );
- Integration::ResourceRequest* request = application.GetPlatform().GetRequest();
- Integration::Bitmap* bitmap = Integration::Bitmap::New( Integration::Bitmap::BITMAP_2D_PACKED_PIXELS, ResourcePolicy::DISCARD );
- Integration::ResourcePointer resource(bitmap);
- bitmap->GetPackedPixelsProfile()->ReserveBuffer(Pixel::RGBA8888, 80, 80, 80, 80);
-
- if(request)
- {
- application.GetPlatform().SetResourceLoaded(request->GetId(), request->GetType()->id, resource);
- }
- application.Render(16);
- application.SendNotification();
-
- DALI_TEST_CHECK ( !application.GetGlAbstraction().CheckTextureDeleted(23) );
-
- // discard texture when actor comes off stage
- Stage::GetCurrent().Remove(actor);
- application.Render(16);
- application.SendNotification();
- application.Render(16);
- application.SendNotification();
- DALI_TEST_CHECK ( application.GetGlAbstraction().CheckTextureDeleted(23) );
- END_TEST;
-}
-
-// 1.6
-int UtcDaliImageNewWithPolicies03(void)
+void LoadBitmapResource(TestPlatformAbstraction& platform)
{
- TestApplication application;
- const Vector2 closestImageSize( 80, 45);
- application.GetPlatform().SetClosestImageSize(closestImageSize);
-
- // load immediately -> resource deletion when taken off stage -> put actor back on stage -> load resource again
- tet_infoline("UtcDaliImageNewWithPolicies03 - Load image with LoadPolicy::Immediate, ReleasePolicy::Unused");
-
- Image image = ResourceImage::New(gTestImageFilename, ResourceImage::IMMEDIATE, Image::UNUSED);
-
- DALI_TEST_CHECK( image );
-
- application.SendNotification();
- application.Render(16);
-
- // request file loading immediately
- DALI_TEST_CHECK( application.GetPlatform().WasCalled(TestPlatformAbstraction::LoadResourceFunc) );
-
- ImageActor actor = ImageActor::New(image);
-
- Stage::GetCurrent().Add(actor);
-
- application.SendNotification();
- application.Render(16);
-
- // testing ReleasePolicy::Unused
- // fake loading image
- std::vector<GLuint> ids;
- ids.push_back( 23 );
- application.GetGlAbstraction().SetNextTextureIds( ids );
- Integration::ResourceRequest* request = application.GetPlatform().GetRequest();
- Integration::Bitmap* bitmap = Integration::Bitmap::New( Integration::Bitmap::BITMAP_2D_PACKED_PIXELS, ResourcePolicy::DISCARD );
+ Integration::ResourceRequest* request = platform.GetRequest();
+ Integration::Bitmap* bitmap = Integration::Bitmap::New( Integration::Bitmap::BITMAP_2D_PACKED_PIXELS, ResourcePolicy::OWNED_DISCARD );
Integration::ResourcePointer resource(bitmap);
bitmap->GetPackedPixelsProfile()->ReserveBuffer(Pixel::RGBA8888, 80, 80, 80, 80);
if(request)
{
- application.GetPlatform().SetResourceLoaded(request->GetId(), request->GetType()->id, resource);
+ platform.SetResourceLoaded(request->GetId(), request->GetType()->id, resource);
}
- application.Render(16);
- application.SendNotification();
-
- DALI_TEST_CHECK ( !application.GetGlAbstraction().CheckTextureDeleted(23) );
-
- // discard texture when actor comes off stage
- Stage::GetCurrent().Remove(actor);
- application.Render(16);
- application.SendNotification();
- application.Render(16);
- application.SendNotification();
- DALI_TEST_CHECK ( application.GetGlAbstraction().CheckTextureDeleted(23) );
-
- // check load request when actor added back to stage
- application.GetPlatform().ResetTrace();
-
- Stage::GetCurrent().Add(actor);
-
- application.SendNotification();
- application.Render(16);
- application.SendNotification();
- application.Render(16);
-
- DALI_TEST_CHECK( application.GetPlatform().WasCalled(TestPlatformAbstraction::LoadResourceFunc) );
- END_TEST;
}
-// 1.7
-int UtcDaliImageNewWithPolicies04(void)
-{
- TestApplication application;
-
- // load immediately, don't release texture when off stage
- tet_infoline("UtcDaliImageNewWithPolicies03 - Load image with LoadPolicy::Immediate, ReleasePolicy::Never");
-
- Image image = ResourceImage::New(gTestImageFilename, ResourceImage::IMMEDIATE, Image::NEVER);
-
- DALI_TEST_CHECK( image );
-
- application.SendNotification();
- application.Render(16);
-
- // request file loading immediately
- DALI_TEST_CHECK( application.GetPlatform().WasCalled(TestPlatformAbstraction::LoadResourceFunc) );
-
- ImageActor actor = ImageActor::New(image);
-
- Stage::GetCurrent().Add(actor);
-
- application.SendNotification();
- application.Render(16);
-
- // testing ReleasePolicy::Never
- // fake loading image
- std::vector<GLuint> ids;
- ids.push_back( 23 );
- application.GetGlAbstraction().SetNextTextureIds( ids );
- Integration::ResourceRequest* request = application.GetPlatform().GetRequest();
- Integration::Bitmap* bitmap = Integration::Bitmap::New( Integration::Bitmap::BITMAP_2D_PACKED_PIXELS, ResourcePolicy::DISCARD );
- Integration::ResourcePointer resource(bitmap);
- bitmap->GetPackedPixelsProfile()->ReserveBuffer(Pixel::RGBA8888, 80, 80, 80, 80);
-
- if(request)
- {
- application.GetPlatform().SetResourceLoaded(request->GetId(), request->GetType()->id, resource);
- }
- application.Render(16);
- application.SendNotification();
-
- DALI_TEST_CHECK ( !application.GetGlAbstraction().CheckTextureDeleted(23) );
-
- // texture is not discarded
- Stage::GetCurrent().Remove(actor);
- application.Render(16);
- application.SendNotification();
- application.Render(16);
- application.SendNotification();
- DALI_TEST_CHECK ( !application.GetGlAbstraction().CheckTextureDeleted(23) );
-
- // no load request when actor added back to stage
- application.GetPlatform().ResetTrace();
-
- Stage::GetCurrent().Add(actor);
-
- application.SendNotification();
- application.Render(16);
- application.SendNotification();
- application.Render(16);
-
- DALI_TEST_CHECK( !application.GetPlatform().WasCalled(TestPlatformAbstraction::LoadResourceFunc) );
- END_TEST;
}
-// 1.8
int UtcDaliImageDownCast(void)
{
TestApplication application;
END_TEST;
}
-// 1.9
-int UtcDaliImageGetImageSize(void)
+int UtcDaliImageGetWidthHeight(void)
{
TestApplication application;
- TestPlatformAbstraction& platform = application.GetPlatform();
- tet_infoline("UtcDaliImageGetImageSize - Image::GetImageSize()");
+ tet_infoline("UtcDaliImageGetWidthHeight - Image::GetWidth() & Image::GetHeight");
Vector2 testSize(8.0f, 16.0f);
- platform.SetClosestImageSize(testSize);
-
- Vector2 size = ResourceImage::GetImageSize(gTestImageFilename);
-
- DALI_TEST_CHECK( application.GetPlatform().GetTrace().FindMethod("GetClosestImageSize"));
- DALI_TEST_EQUALS( size, testSize, TEST_LOCATION);
- END_TEST;
-}
-
-// 1.10
-int UtcDaliImageGetUrl(void)
-{
- TestApplication application;
-
- tet_infoline("UtcDaliImageGetFilename");
-
- // invoke default handle constructor
- ResourceImage image;
-
- DALI_TEST_CHECK( !image );
-
- // initialise handle
- image = ResourceImage::New(gTestImageFilename);
-
- DALI_TEST_EQUALS( image.GetUrl(), gTestImageFilename, TEST_LOCATION);
- END_TEST;
-}
-
-// 1.11
-int UtcDaliImageGetLoadingState01(void)
-{
- TestApplication application;
- tet_infoline("UtcDaliImageGetLoadingState01");
-
- ResourceImage image = ResourceImage::New(gTestImageFilename);
- DALI_TEST_CHECK(image.GetLoadingState() == ResourceLoading);
- application.SendNotification();
- application.Render(16);
-
- // simulate load success
- Integration::ResourceRequest* request = application.GetPlatform().GetRequest();
- Integration::Bitmap* bitmap = Integration::Bitmap::New( Integration::Bitmap::BITMAP_2D_PACKED_PIXELS, ResourcePolicy::DISCARD );
- Integration::ResourcePointer resource(bitmap);
- bitmap->GetPackedPixelsProfile()->ReserveBuffer(Pixel::RGBA8888, 80, 80, 80, 80);
-
- if(request)
- {
- application.GetPlatform().SetResourceLoaded(request->GetId(), request->GetType()->id, resource);
- }
- application.Render(16);
- application.SendNotification();
-
- // Test state == ResourceLoadingSucceeded
- DALI_TEST_CHECK(image.GetLoadingState() == ResourceLoadingSucceeded);
- END_TEST;
-}
-
-// 1.12
-int UtcDaliImageGetLoadingState02(void)
-{
- TestApplication application;
-
- tet_infoline("UtcDaliImageGetLoadingState02");
-
- // invoke default handle constructor
- ResourceImage image;
-
- DALI_TEST_CHECK( !image );
-
- // initialise handle
- image = ResourceImage::New(gTestImageFilename);
-
- // Test state == ResourceLoading
- DALI_TEST_CHECK(image.GetLoadingState() == ResourceLoading);
- application.SendNotification();
- application.Render(16);
-
- // simulate load failure
- Integration::ResourceRequest* request = application.GetPlatform().GetRequest();
- if(request)
- {
- application.GetPlatform().SetResourceLoadFailed(request->GetId(), Integration::FailureUnknown);
- }
- application.Render(16);
- application.SendNotification();
-
- // Test state == ResourceLoadingFailed
- DALI_TEST_CHECK(image.GetLoadingState() == ResourceLoadingFailed);
- END_TEST;
-}
-
-// 1.13
-int UtcDaliImageGetReleasePolicy(void)
-{
- TestApplication application;
-
- tet_infoline("UtcDaliImageGetReleasePolicy");
-
- Image image = ResourceImage::New(gTestImageFilename, ResourceImage::IMMEDIATE, Image::UNUSED);
-
- DALI_TEST_CHECK( image );
-
- DALI_TEST_CHECK( Image::UNUSED == image.GetReleasePolicy() );
-
- END_TEST;
-}
-
-// 1.14
-int UtcDaliImageGetLoadPolicy(void)
-{
- TestApplication application;
+ application.GetPlatform().SetClosestImageSize(testSize);
+ Image image1 = ResourceImage::New(gTestImageFilename);
+ DALI_TEST_EQUALS( image1.GetWidth(), testSize.width, TEST_LOCATION );
+ DALI_TEST_EQUALS( image1.GetHeight(), testSize.height, TEST_LOCATION );
- tet_infoline("UtcDaliImageGetLoadPolicy");
+ Image image2 = ResourceImage::New( gTestImageFilename, ImageDimensions(128, 256), FittingMode::SCALE_TO_FILL, SamplingMode::DEFAULT );
+ DALI_TEST_EQUALS( image2.GetWidth(), 128u, TEST_LOCATION );
+ DALI_TEST_EQUALS( image2.GetHeight(), 256u, TEST_LOCATION );
- ResourceImage image = ResourceImage::New(gTestImageFilename, ResourceImage::ON_DEMAND, Image::NEVER);
+ Image image3 = FrameBufferImage::New(16, 32);
+ DALI_TEST_EQUALS(image3.GetWidth(), 16u, TEST_LOCATION);
+ DALI_TEST_EQUALS(image3.GetHeight(), 32u, TEST_LOCATION);
- DALI_TEST_CHECK( image );
+ TestNativeImagePointer nativeImage = TestNativeImage::New(32, 64);
+ Image image4 = NativeImage::New(*(nativeImage.Get()));
+ DALI_TEST_EQUALS(image4.GetWidth(), 32u, TEST_LOCATION);
+ DALI_TEST_EQUALS(image4.GetHeight(), 64u, TEST_LOCATION);
- DALI_TEST_CHECK( ResourceImage::ON_DEMAND == image.GetLoadPolicy());
END_TEST;
}
-static bool SignalLoadFlag = false;
-
-static void SignalLoadHandler(ResourceImage image)
-{
- tet_infoline("Received image load finished signal");
-
- SignalLoadFlag = true;
-}
-
static bool SignalUploadedFlag = false;
static void SignalUploadedHandler(Image image)
SignalUploadedFlag = true;
}
-// 1.15
-int UtcDaliImageSignalLoadingFinished(void)
-{
- TestApplication application;
-
- tet_infoline("UtcDaliImageSignalLoadingFinished");
-
- SignalLoadFlag = false;
-
- ResourceImage image = ResourceImage::New(gTestImageFilename);
-
- image.LoadingFinishedSignal().Connect( SignalLoadHandler );
- application.SendNotification();
- application.Render(16);
-
- Integration::ResourceRequest* request = application.GetPlatform().GetRequest();
- if(request)
- {
- application.GetPlatform().SetResourceLoaded(request->GetId(), request->GetType()->id, Integration::ResourcePointer(Integration::Bitmap::New(Integration::Bitmap::BITMAP_2D_PACKED_PIXELS, ResourcePolicy::DISCARD)));
- }
-
- application.Render(16);
- application.SendNotification();
-
- DALI_TEST_CHECK( SignalLoadFlag == true );
- END_TEST;
-}
-
-// 1.16
int UtcDaliImageSignalUploaded(void)
{
TestApplication application;
+ TestPlatformAbstraction& platform = application.GetPlatform();
tet_infoline("UtcDaliImageSignalUploaded - Image::SignalUploaded()");
// set up image in fake platform abstraction
Vector2 testSize(80.0f, 80.0f);
- application.GetPlatform().SetClosestImageSize(testSize);
+ platform.SetClosestImageSize(testSize);
ResourceImage image = ResourceImage::New(gTestImageFilename);
- image.LoadingFinishedSignal().Connect( SignalLoadHandler );
// Load image
application.SendNotification();
std::vector<GLuint> ids;
ids.push_back( 23 );
application.GetGlAbstraction().SetNextTextureIds( ids );
- Integration::ResourceRequest* request = application.GetPlatform().GetRequest();
- Integration::Bitmap* bitmap = Integration::Bitmap::New( Integration::Bitmap::BITMAP_2D_PACKED_PIXELS, ResourcePolicy::DISCARD );
+ Integration::ResourceRequest* request = platform.GetRequest();
+ Integration::Bitmap* bitmap = Integration::Bitmap::New( Integration::Bitmap::BITMAP_2D_PACKED_PIXELS, ResourcePolicy::OWNED_DISCARD );
Integration::ResourcePointer resource(bitmap);
bitmap->GetPackedPixelsProfile()->ReserveBuffer(Pixel::RGBA8888, 80, 80, 80, 80);
+
if(request)
{
- application.GetPlatform().SetResourceLoaded(request->GetId(), request->GetType()->id, resource);
+ platform.SetResourceLoaded(request->GetId(), request->GetType()->id, resource);
}
application.Render(16);
application.SendNotification();
image.UploadedSignal().Connect( SignalUploadedHandler );
- Dali::ImageActor imageActor = ImageActor::New(image);
- Stage::GetCurrent().Add(imageActor);
- imageActor.SetSize(80, 80);
- imageActor.SetVisible(true);
+ Dali::Actor actor = CreateRenderableActor( image );
+ Stage::GetCurrent().Add( actor );
+ actor.SetSize(80, 80);
+ actor.SetVisible(true);
application.SendNotification();
application.Render(0);
application.Render(16);
application.SendNotification();
- DALI_TEST_CHECK( SignalLoadFlag == true );
DALI_TEST_CHECK( SignalUploadedFlag == true );
- SignalLoadFlag = false;
SignalUploadedFlag = false;
image.Reload();
bitmap->GetPackedPixelsProfile()->ReserveBuffer(Pixel::RGBA8888, 160, 160, 160, 160);
+ // image loading
application.SendNotification();
application.Render(16);
application.Render(16);
application.SendNotification();
- DALI_TEST_CHECK( SignalLoadFlag == true );
+ request = platform.GetRequest();
+ if(request)
+ {
+ platform.SetResourceLoaded(request->GetId(), request->GetType()->id, resource);
+ }
+
+ //upload
application.Render(16);
application.SendNotification();
application.Render(16);
END_TEST;
}
-// 1.17
int UtcDaliImageDiscard01(void)
{
TestApplication application;
std::vector<GLuint> ids;
ids.push_back( 23 );
application.GetGlAbstraction().SetNextTextureIds( ids );
- Integration::ResourceRequest* request = application.GetPlatform().GetRequest();
- Integration::Bitmap* bitmap = Integration::Bitmap::New( Integration::Bitmap::BITMAP_2D_PACKED_PIXELS, ResourcePolicy::DISCARD );
- Integration::ResourcePointer resource(bitmap);
- bitmap->GetPackedPixelsProfile()->ReserveBuffer(Pixel::RGBA8888, 80, 80, 80, 80);
- if(request)
- {
- application.GetPlatform().SetResourceLoaded(request->GetId(), request->GetType()->id, resource);
- }
+ TestPlatformAbstraction& platform = application.GetPlatform();
+ LoadBitmapResource( platform );
application.Render(16);
application.SendNotification();
} // Drop image handle
END_TEST;
}
-// 1.18
int UtcDaliImageDiscard02(void)
{
TestApplication application;
{
{
- ImageActor actor;
+ Actor actor;
{
- ImageAttributes attrs;
- const Vector2 requestedSize( 40, 30 );
- attrs.SetSize( requestedSize.width, requestedSize.height );
- Image image = ResourceImage::New(gTestImageFilename, attrs);
- actor = ImageActor::New(image);
+ Image image = ResourceImage::New(gTestImageFilename, ImageDimensions( 40, 30 ) );
+ actor = CreateRenderableActor(image);
Stage::GetCurrent().Add(actor);
application.SendNotification();
ids.push_back( 23 );
application.GetGlAbstraction().SetNextTextureIds( ids );
- Integration::ResourceRequest* request = application.GetPlatform().GetRequest();
- Integration::Bitmap* bitmap = Integration::Bitmap::New( Integration::Bitmap::BITMAP_2D_PACKED_PIXELS, ResourcePolicy::DISCARD );
- Integration::ResourcePointer resource(bitmap);
- bitmap->GetPackedPixelsProfile()->ReserveBuffer(Pixel::RGBA8888, 80, 80, 80, 80);
- if(request)
- {
- application.GetPlatform().SetResourceLoaded(request->GetId(), request->GetType()->id, resource);
- }
+ TestPlatformAbstraction& platform = application.GetPlatform();
+ LoadBitmapResource( platform );
application.Render(16);
application.SendNotification();
DALI_TEST_CHECK( application.GetGlAbstraction().GetTextureTrace().FindMethod("BindTexture") );
END_TEST;
}
-// 1.19
int UtcDaliImageDiscard03(void)
{
TestApplication application;
application.GetPlatform().SetClosestImageSize(closestImageSize);
Image image = ResourceImage::New(gTestImageFilename);
- ImageActor actor = ImageActor::New(image);
+ Actor actor = CreateRenderableActor(image);
Stage::GetCurrent().Add(actor);
application.SendNotification();
ids.push_back( 23 );
application.GetGlAbstraction().SetNextTextureIds( ids );
- Integration::ResourceRequest* request = application.GetPlatform().GetRequest();
- Integration::Bitmap* bitmap = Integration::Bitmap::New( Integration::Bitmap::BITMAP_2D_PACKED_PIXELS, ResourcePolicy::DISCARD );
-
- Integration::ResourcePointer resource(bitmap);
- bitmap->GetPackedPixelsProfile()->ReserveBuffer(Pixel::RGBA8888, 80, 80, 80, 80);
- if(request)
- {
- application.GetPlatform().SetResourceLoaded(request->GetId(), request->GetType()->id, resource);
- }
+ TestPlatformAbstraction& platform = application.GetPlatform();
+ LoadBitmapResource( platform );
application.Render(16);
application.SendNotification();
application.SendNotification();
END_TEST;
}
-
-namespace
-{
-void LoadBitmapResource(TestPlatformAbstraction& platform)
-{
- Integration::ResourceRequest* request = platform.GetRequest();
- Integration::Bitmap* bitmap = Integration::Bitmap::New( Integration::Bitmap::BITMAP_2D_PACKED_PIXELS, ResourcePolicy::DISCARD );
- Integration::ResourcePointer resource(bitmap);
- bitmap->GetPackedPixelsProfile()->ReserveBuffer(Pixel::RGBA8888, 80, 80, 80, 80);
-
- if(request)
- {
- platform.SetResourceLoaded(request->GetId(), request->GetType()->id, resource);
- }
-}
-
-}
-
int UtcDaliImageContextLoss(void)
{
TestApplication application; // Default config: DALI_DISCARDS_ALL_DATA
platform.SetClosestImageSize(closestImageSize);
- tet_infoline("UtcDaliImageContextLoss - Load image with LoadPolicy::Immediate, ReleasePolicy::Never, bitmap discard. Check that the image is re-requested on context regain\n");
+ tet_infoline("UtcDaliImageContextLoss - Load image with LoadPolicy::Immediate, bitmap discard. Check that the image is re-requested on context regain\n");
- Image image = ResourceImage::New("image.png", ResourceImage::IMMEDIATE, Image::NEVER);
+ Image image = ResourceImage::New("image.png");
DALI_TEST_CHECK( image );
// request file loading immediately
DALI_TEST_CHECK( platform.WasCalled(TestPlatformAbstraction::LoadResourceFunc) );
- ImageActor actor = ImageActor::New(image);
+ Actor actor = CreateRenderableActor(image);
Stage::GetCurrent().Add(actor);
application.SendNotification();
projects / platform / core / uifw / dali-core.git / blobdiff