X-Git-Url: http://review.tizen.org/git/?a=blobdiff_plain;f=automated-tests%2Fsrc%2Fdali-toolkit%2Futc-Dali-CanvasView.cpp;h=1a9c1db0e5c9eae26eba660c3386eafe33ac72d1;hb=c6cb5242f7cad712ce7057836fa8cd41c0b0622e;hp=60a7a4618bb846117ed3dec09488a1d2e0c86ba9;hpb=d3e4ed352b1b3436394c7a218a961487b7ee00fa;p=platform%2Fcore%2Fuifw%2Fdali-toolkit.git diff --git a/automated-tests/src/dali-toolkit/utc-Dali-CanvasView.cpp b/automated-tests/src/dali-toolkit/utc-Dali-CanvasView.cpp index 60a7a46..1a9c1db 100644 --- a/automated-tests/src/dali-toolkit/utc-Dali-CanvasView.cpp +++ b/automated-tests/src/dali-toolkit/utc-Dali-CanvasView.cpp @@ -1,5 +1,5 @@ /* - * Copyright (c) 2021 Samsung Electronics Co., Ltd. + * Copyright (c) 2022 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. @@ -15,25 +15,29 @@ * */ -#include #include +#include + +#include +#include + #include + +#include + #include -#include +#include +#include +#include +#include #include -#include -#include -#include -#include -#include +#include using namespace Dali; using namespace Toolkit; namespace { - - } // namespace void utc_dali_toolkit_canvasview_startup(void) @@ -49,21 +53,21 @@ void utc_dali_toolkit_canvasview_cleanup(void) int UtcDaliCanvasViewConstructorP(void) { ToolkitTestApplication application; - CanvasView canvasView; + CanvasView canvasView; - DALI_TEST_CHECK( !canvasView ); + DALI_TEST_CHECK(!canvasView); END_TEST; } int UtcDaliCanvasViewMoveAssignment(void) { ToolkitTestApplication application; - CanvasView canvasView = CanvasView::New(Vector2(100, 100)); + CanvasView canvasView = CanvasView::New(Vector2(100, 100)); - CanvasView moved = std::move( canvasView ); - DALI_TEST_CHECK( moved ); - DALI_TEST_EQUALS( 1, moved.GetBaseObject().ReferenceCount(), TEST_LOCATION ); - DALI_TEST_CHECK( !canvasView ); + CanvasView moved = std::move(canvasView); + DALI_TEST_CHECK(moved); + DALI_TEST_EQUALS(1, moved.GetBaseObject().ReferenceCount(), TEST_LOCATION); + DALI_TEST_CHECK(!canvasView); END_TEST; } @@ -71,57 +75,57 @@ int UtcDaliCanvasViewMoveAssignment(void) int UtcDaliCanvasViewAssignmentConstructorP(void) { ToolkitTestApplication application; - CanvasView canvasView = CanvasView::New(Vector2(100, 100)); + CanvasView canvasView = CanvasView::New(Vector2(100, 100)); - CanvasView copy( canvasView ); - DALI_TEST_CHECK( copy ); + CanvasView copy(canvasView); + DALI_TEST_CHECK(copy); - DALI_TEST_CHECK( canvasView == copy ); + DALI_TEST_CHECK(canvasView == copy); END_TEST; } int UtcDaliCanvasViewAssignmentOperatorP(void) { ToolkitTestApplication application; - const CanvasView canvasView = CanvasView::New(Vector2(100, 100)); + const CanvasView canvasView = CanvasView::New(Vector2(100, 100)); CanvasView assign; - DALI_TEST_CHECK( !assign ); + DALI_TEST_CHECK(!assign); - assign = canvasView ; - DALI_TEST_CHECK( assign == canvasView); + assign = canvasView; + DALI_TEST_CHECK(assign == canvasView); END_TEST; } int UtcDaliCanvasViewNewP(void) { ToolkitTestApplication application; - CanvasView canvasView = CanvasView::New(Vector2(100, 100)); + CanvasView canvasView = CanvasView::New(Vector2(100, 100)); - DALI_TEST_CHECK( canvasView ); + DALI_TEST_CHECK(canvasView); END_TEST; } int UtcDaliCanvasViewNewWithoutViewboxP(void) { ToolkitTestApplication application; - CanvasView canvasView = CanvasView::New(); + CanvasView canvasView = CanvasView::New(); - DALI_TEST_CHECK( canvasView ); + DALI_TEST_CHECK(canvasView); END_TEST; } int UtcDaliCanvasViewDownCastP(void) { ToolkitTestApplication application; - CanvasView canvasView = CanvasView::New(Vector2(100,100)); + CanvasView canvasView = CanvasView::New(Vector2(100, 100)); BaseHandle object(canvasView); - CanvasView canvasView2 = CanvasView::DownCast( object ); + CanvasView canvasView2 = CanvasView::DownCast(object); DALI_TEST_CHECK(canvasView2); - CanvasView canvasView3 = DownCast< CanvasView >(object); + CanvasView canvasView3 = DownCast(object); DALI_TEST_CHECK(canvasView3); END_TEST; } @@ -129,21 +133,21 @@ int UtcDaliCanvasViewDownCastP(void) int UtcDaliCanvasViewDownCastN(void) { ToolkitTestApplication application; - BaseHandle unInitializedObject; + BaseHandle unInitializedObject; - CanvasView canvasView1 = CanvasView::DownCast( unInitializedObject ); - DALI_TEST_CHECK( !canvasView1 ); + CanvasView canvasView1 = CanvasView::DownCast(unInitializedObject); + DALI_TEST_CHECK(!canvasView1); - CanvasView canvasView2 = DownCast< CanvasView >( unInitializedObject ); - DALI_TEST_CHECK( !canvasView2 ); + CanvasView canvasView2 = DownCast(unInitializedObject); + DALI_TEST_CHECK(!canvasView2); END_TEST; } int UtcDaliCanvasViewAddP(void) { ToolkitTestApplication application; - CanvasView canvasView = CanvasView::New(Vector2(100,100)); - DALI_TEST_CHECK( canvasView ); + CanvasView canvasView = CanvasView::New(Vector2(100, 100)); + DALI_TEST_CHECK(canvasView); Dali::CanvasRenderer::Shape shape = Dali::CanvasRenderer::Shape::New(); @@ -157,8 +161,8 @@ int UtcDaliCanvasViewAddP(void) int UtcDaliCanvasViewAddN(void) { ToolkitTestApplication application; - CanvasView canvasView = CanvasView::New(Vector2(100,100)); - DALI_TEST_CHECK( canvasView ); + CanvasView canvasView = CanvasView::New(Vector2(100, 100)); + DALI_TEST_CHECK(canvasView); Dali::CanvasRenderer::Shape shape; @@ -167,294 +171,211 @@ int UtcDaliCanvasViewAddN(void) END_TEST; } -int UtcDaliCanvasViewChangeSizeP(void) +int UtcDaliCanvasViewRemoveP(void) { ToolkitTestApplication application; + CanvasView canvasView = CanvasView::New(Vector2(100, 100)); + DALI_TEST_CHECK(canvasView); - CanvasView canvasView = CanvasView::New(Vector2(100,100)); - DALI_TEST_CHECK( canvasView ); - - application.GetScene().Add(canvasView); - - canvasView.SetProperty(Actor::Property::SIZE, Vector2(300, 300)); + Dali::CanvasRenderer::Shape shape = Dali::CanvasRenderer::Shape::New(); - application.SendNotification(); - application.Render(); + canvasView.AddDrawable(shape); - Property::Value pv = canvasView.GetProperty(Actor::Property::SIZE); - Vector3 v3; - pv.Get(v3); - DALI_TEST_EQUALS( v3, Vector3(300, 300, 0), TEST_LOCATION ); + DALI_TEST_CHECK(canvasView.RemoveDrawable(shape)); END_TEST; } -int UtcDaliCanvasViewSizeN(void) +int UtcDaliCanvasViewRemoveN(void) { ToolkitTestApplication application; - CanvasView canvasView = CanvasView::New(Vector2(100,100)); - DALI_TEST_CHECK( canvasView ); - - application.GetScene().Add(canvasView); + CanvasView canvasView = CanvasView::New(Vector2(100, 100)); + DALI_TEST_CHECK(canvasView); - canvasView.SetProperty(Actor::Property::SIZE, Vector2(-999, -999)); + Dali::CanvasRenderer::Shape shape = Dali::CanvasRenderer::Shape::New(); - application.SendNotification(); - application.Render(); - - Property::Value pv = canvasView.GetProperty(Actor::Property::SIZE); - Vector3 v3; - pv.Get(v3); - DALI_TEST_EQUALS( v3, Vector3(-999, -999, 0), TEST_LOCATION ); + DALI_TEST_CHECK(!canvasView.RemoveDrawable(shape)); END_TEST; } -int UtcDaliCanvasViewRasterizeTaskP(void) +int UtcDaliCanvasViewRemoveAllP(void) { ToolkitTestApplication application; + CanvasView canvasView = CanvasView::New(Vector2(100, 100)); + DALI_TEST_CHECK(canvasView); - Dali::Toolkit::Internal::CanvasView* dummyInternalCanvasView = new Dali::Toolkit::Internal::CanvasView(Vector2(100,100)); - DALI_TEST_CHECK( dummyInternalCanvasView ); + Dali::CanvasRenderer::Shape shape = Dali::CanvasRenderer::Shape::New(); - Dali::CanvasRenderer dummyCanvasRenderer = Dali::CanvasRenderer::New(Vector2(100, 100)); - DALI_TEST_CHECK( dummyCanvasRenderer ); + canvasView.AddDrawable(shape); - IntrusivePtr task = new Dali::Toolkit::Internal::CanvasRendererRasterizingTask(dummyInternalCanvasView, dummyCanvasRenderer); - DALI_TEST_CHECK( task ); + canvasView.RemoveAllDrawables(); END_TEST; } -int UtcDaliCanvasViewRasterizeTaskGetCanvasViewP(void) +int UtcDaliCanvasViewRemoveAllN(void) { ToolkitTestApplication application; - Dali::Toolkit::Internal::CanvasView* dummyInternalCanvasView = new Dali::Toolkit::Internal::CanvasView(Vector2(100,100)); - DALI_TEST_CHECK( dummyInternalCanvasView ); - - Dali::CanvasRenderer dummyCanvasRenderer = Dali::CanvasRenderer::New(Vector2(100, 100)); - DALI_TEST_CHECK( dummyCanvasRenderer ); - - IntrusivePtr task = new Dali::Toolkit::Internal::CanvasRendererRasterizingTask(dummyInternalCanvasView, dummyCanvasRenderer); - DALI_TEST_CHECK( task ); + CanvasView canvasView = CanvasView::New(Vector2(100, 100)); + DALI_TEST_CHECK(canvasView); - DALI_TEST_EQUALS( task->GetCanvasView(), dummyInternalCanvasView, TEST_LOCATION ); + canvasView.RemoveAllDrawables(); END_TEST; } -int UtcDaliCanvasViewRasterizeTaskGetBufferSizeP(void) +int UtcDaliCanvasViewChangeSizeP(void) { ToolkitTestApplication application; - Dali::Toolkit::Internal::CanvasView* dummyInternalCanvasView = new Dali::Toolkit::Internal::CanvasView(Vector2(100,100)); - DALI_TEST_CHECK( dummyInternalCanvasView ); - - Dali::CanvasRenderer dummyCanvasRenderer = Dali::CanvasRenderer::New(Vector2(100, 100)); - DALI_TEST_CHECK( dummyCanvasRenderer ); - - IntrusivePtr task = new Dali::Toolkit::Internal::CanvasRendererRasterizingTask(dummyInternalCanvasView, dummyCanvasRenderer); - DALI_TEST_CHECK( task ); - - //There is no rasterized buffer. - DALI_TEST_EQUALS( task->GetBufferSize(), Vector2(0, 0), TEST_LOCATION ); - - END_TEST; -} - -int UtcDaliCanvasViewRasterizeTaskGetPixelDataP(void) -{ + CanvasView canvasView = CanvasView::New(Vector2(100, 100)); + DALI_TEST_CHECK(canvasView); - Dali::Toolkit::Internal::CanvasView* dummyInternalCanvasView = new Dali::Toolkit::Internal::CanvasView(Vector2(100,100)); - DALI_TEST_CHECK( dummyInternalCanvasView ); + application.GetScene().Add(canvasView); - Dali::CanvasRenderer dummyCanvasRenderer = Dali::CanvasRenderer::New(Vector2(100, 100)); - DALI_TEST_CHECK( dummyCanvasRenderer ); + canvasView.SetProperty(Actor::Property::SIZE, Vector2(300, 300)); - IntrusivePtr task = new Dali::Toolkit::Internal::CanvasRendererRasterizingTask(dummyInternalCanvasView, dummyCanvasRenderer); - DALI_TEST_CHECK( task ); + application.SendNotification(); + application.Render(); - DALI_TEST_EQUALS( task->GetPixelData(), PixelData(), TEST_LOCATION ); + Property::Value pv = canvasView.GetProperty(Actor::Property::SIZE); + Vector3 v3; + pv.Get(v3); + DALI_TEST_EQUALS(v3, Vector3(300, 300, 0), TEST_LOCATION); END_TEST; } -int UtcDaliCanvasViewRasterizeThreadP(void) +int UtcDaliCanvasViewSizeN(void) { ToolkitTestApplication application; - Dali::Toolkit::Internal::CanvasView* dummyInternalCanvasView = new Dali::Toolkit::Internal::CanvasView(Vector2(100,100)); - DALI_TEST_CHECK( dummyInternalCanvasView ); + CanvasView canvasView = CanvasView::New(Vector2(100, 100)); + DALI_TEST_CHECK(canvasView); - Dali::CanvasRenderer dummyCanvasRenderer = Dali::CanvasRenderer::New(Vector2(100, 100)); - DALI_TEST_CHECK( dummyCanvasRenderer ); + application.GetScene().Add(canvasView); - IntrusivePtr task = new Dali::Toolkit::Internal::CanvasRendererRasterizingTask(dummyInternalCanvasView, dummyCanvasRenderer); - DALI_TEST_CHECK( task ); + canvasView.SetProperty(Actor::Property::SIZE, Vector2(-999, -999)); - Dali::Toolkit::Internal::CanvasViewRasterizeThread *dummyThread = new Dali::Toolkit::Internal::CanvasViewRasterizeThread(); - DALI_TEST_CHECK( dummyThread ); + application.SendNotification(); + application.Render(); + + Property::Value pv = canvasView.GetProperty(Actor::Property::SIZE); + Vector3 v3; + pv.Get(v3); + DALI_TEST_EQUALS(v3, Vector3(-999, -999, 0), TEST_LOCATION); END_TEST; } -int UtcDaliCanvasViewRasterizeThreadAddTaskP(void) +bool gRasterizationCompletedSignal = false; +void rasteriztionCompleted(IntrusivePtr task) { - ToolkitTestApplication application; - - Dali::Toolkit::Internal::CanvasView* dummyInternalCanvasView = new Dali::Toolkit::Internal::CanvasView(Vector2(100,100)); - DALI_TEST_CHECK( dummyInternalCanvasView ); - - Dali::CanvasRenderer dummyCanvasRenderer = Dali::CanvasRenderer::New(Vector2(100, 100)); - DALI_TEST_CHECK( dummyCanvasRenderer ); - - IntrusivePtr task = new Dali::Toolkit::Internal::CanvasRendererRasterizingTask(dummyInternalCanvasView, dummyCanvasRenderer); - DALI_TEST_CHECK( task ); - - IntrusivePtr task2 = new Dali::Toolkit::Internal::CanvasRendererRasterizingTask(dummyInternalCanvasView, dummyCanvasRenderer); - DALI_TEST_CHECK( task2 ); - - Dali::Toolkit::Internal::CanvasViewRasterizeThread *dummyThread = new Dali::Toolkit::Internal::CanvasViewRasterizeThread(); - DALI_TEST_CHECK( dummyThread ); - - dummyThread->AddTask(task); - dummyThread->AddTask(task2); - - END_TEST; + gRasterizationCompletedSignal = true; } -int UtcDaliCanvasViewRasterizeThreadAddRemoveTaskP(void) +int UtcDaliCanvasViewRasterizeTaskP(void) { ToolkitTestApplication application; - Dali::Toolkit::Internal::CanvasView* dummyInternalCanvasView = new Dali::Toolkit::Internal::CanvasView(Vector2(100,100)); - DALI_TEST_CHECK( dummyInternalCanvasView ); + Dali::Toolkit::Internal::CanvasView* dummyInternalCanvasView = new Dali::Toolkit::Internal::CanvasView(Vector2(100, 100)); + DALI_TEST_CHECK(dummyInternalCanvasView); Dali::CanvasRenderer dummyCanvasRenderer = Dali::CanvasRenderer::New(Vector2(100, 100)); - DALI_TEST_CHECK( dummyCanvasRenderer ); - - IntrusivePtr task = new Dali::Toolkit::Internal::CanvasRendererRasterizingTask(dummyInternalCanvasView, dummyCanvasRenderer); - DALI_TEST_CHECK( task ); - - Dali::Toolkit::Internal::CanvasViewRasterizeThread *dummyThread = new Dali::Toolkit::Internal::CanvasViewRasterizeThread(); - DALI_TEST_CHECK( dummyThread ); - - dummyThread->AddTask(task); + DALI_TEST_CHECK(dummyCanvasRenderer); - dummyThread->RemoveTask(dummyInternalCanvasView); + IntrusivePtr task = new Dali::Toolkit::Internal::CanvasRendererRasterizingTask(dummyCanvasRenderer, MakeCallback(rasteriztionCompleted)); + DALI_TEST_CHECK(task); END_TEST; } -int UtcDaliCanvasViewRasterizeThreadApplyRasterizedP(void) +int UtcDaliCanvasViewRasterizeTaskAddTaskP(void) { ToolkitTestApplication application; - Dali::Toolkit::Internal::CanvasView* dummyInternalCanvasView = new Dali::Toolkit::Internal::CanvasView(Vector2(100,100)); - DALI_TEST_CHECK( dummyInternalCanvasView ); + Dali::Toolkit::Internal::CanvasView* dummyInternalCanvasView = new Dali::Toolkit::Internal::CanvasView(Vector2(100, 100)); + DALI_TEST_CHECK(dummyInternalCanvasView); Dali::CanvasRenderer dummyCanvasRenderer = Dali::CanvasRenderer::New(Vector2(100, 100)); - DALI_TEST_CHECK( dummyCanvasRenderer ); + DALI_TEST_CHECK(dummyCanvasRenderer); - IntrusivePtr task = new Dali::Toolkit::Internal::CanvasRendererRasterizingTask(dummyInternalCanvasView, dummyCanvasRenderer); - DALI_TEST_CHECK( task ); + IntrusivePtr task = new Dali::Toolkit::Internal::CanvasRendererRasterizingTask(dummyCanvasRenderer, MakeCallback(rasteriztionCompleted)); + DALI_TEST_CHECK(task); - Dali::Toolkit::Internal::CanvasViewRasterizeThread *dummyThread = new Dali::Toolkit::Internal::CanvasViewRasterizeThread(); - DALI_TEST_CHECK( dummyThread ); + IntrusivePtr task2 = new Dali::Toolkit::Internal::CanvasRendererRasterizingTask(dummyCanvasRenderer, MakeCallback(rasteriztionCompleted)); + DALI_TEST_CHECK(task2); - dummyThread->AddTask(task); + Dali::AsyncTaskManager asyncTaskManager = Dali::AsyncTaskManager::Get(); + DALI_TEST_CHECK(asyncTaskManager); - dummyThread->ApplyRasterized(); + asyncTaskManager.AddTask(task); + asyncTaskManager.AddTask(task2); END_TEST; } -int UtcDaliCanvasViewRasterizeThreadTerminateThreadP(void) +int UtcDaliCanvasViewRasterizeTaskAddRemoveTaskP(void) { ToolkitTestApplication application; - Dali::Toolkit::Internal::CanvasView* dummyInternalCanvasView = new Dali::Toolkit::Internal::CanvasView(Vector2(100,100)); - DALI_TEST_CHECK( dummyInternalCanvasView ); + Dali::Toolkit::Internal::CanvasView* dummyInternalCanvasView = new Dali::Toolkit::Internal::CanvasView(Vector2(100, 100)); + DALI_TEST_CHECK(dummyInternalCanvasView); Dali::CanvasRenderer dummyCanvasRenderer = Dali::CanvasRenderer::New(Vector2(100, 100)); - DALI_TEST_CHECK( dummyCanvasRenderer ); + DALI_TEST_CHECK(dummyCanvasRenderer); - IntrusivePtr task = new Dali::Toolkit::Internal::CanvasRendererRasterizingTask(dummyInternalCanvasView, dummyCanvasRenderer); - DALI_TEST_CHECK( task ); + IntrusivePtr task = new Dali::Toolkit::Internal::CanvasRendererRasterizingTask(dummyCanvasRenderer, MakeCallback(rasteriztionCompleted)); + DALI_TEST_CHECK(task); - Dali::Toolkit::Internal::CanvasViewRasterizeThread *dummyThread = new Dali::Toolkit::Internal::CanvasViewRasterizeThread(); - DALI_TEST_CHECK( dummyThread ); + Dali::AsyncTaskManager asyncTaskManager = Dali::AsyncTaskManager::Get(); + DALI_TEST_CHECK(asyncTaskManager); - dummyThread->AddTask(task); + asyncTaskManager.AddTask(task); - Dali::Toolkit::Internal::CanvasViewRasterizeThread::TerminateThread(dummyThread); + asyncTaskManager.RemoveTask(task); END_TEST; } -PixelData CreatePixelData( unsigned int width, unsigned int height ) +PixelData CreatePixelData(unsigned int width, unsigned int height) { - unsigned int bufferSize = width*height*Pixel::GetBytesPerPixel( Pixel::RGBA8888 ); + unsigned int bufferSize = width * height * Pixel::GetBytesPerPixel(Pixel::RGBA8888); - unsigned char* buffer= reinterpret_cast( malloc( bufferSize ) ); - PixelData pixelData = PixelData::New( buffer, bufferSize, width, height, Pixel::RGBA8888, PixelData::FREE ); + unsigned char* buffer = reinterpret_cast(malloc(bufferSize)); + PixelData pixelData = PixelData::New(buffer, bufferSize, width, height, Pixel::RGBA8888, PixelData::FREE); return pixelData; } -int UtcDaliCanvasViewRasterizeThreadCallProcessP(void) -{ - ToolkitTestApplication application; - - Dali::Toolkit::Internal::CanvasView* dummyInternalCanvasView = new Dali::Toolkit::Internal::CanvasView(Vector2(100,100)); - DALI_TEST_CHECK( dummyInternalCanvasView ); - - Dali::CanvasRenderer dummyCanvasRenderer = Dali::CanvasRenderer::New(Vector2(100, 100)); - DALI_TEST_CHECK( dummyCanvasRenderer ); - - IntrusivePtr task = new Dali::Toolkit::Internal::CanvasRendererRasterizingTask(dummyInternalCanvasView, dummyCanvasRenderer); - DALI_TEST_CHECK( task ); - - Dali::Toolkit::Internal::CanvasViewRasterizeThread *dummyThread = new Dali::Toolkit::Internal::CanvasViewRasterizeThread(); - DALI_TEST_CHECK( dummyThread ); - - dummyThread->AddTask(task); - - dummyThread->Process(false); - - END_TEST; -} - int UtcDaliCanvasViewRasterizeThreadRasterizationCompletedSignalP(void) { ToolkitTestApplication application; - Dali::Toolkit::Internal::CanvasView* dummyInternalCanvasView = new Dali::Toolkit::Internal::CanvasView(Vector2(100,100)); - DALI_TEST_CHECK( dummyInternalCanvasView ); + gRasterizationCompletedSignal = false; - Dali::CanvasRenderer dummyCanvasRenderer = Dali::CanvasRenderer::New(Vector2(100, 100)); - DALI_TEST_CHECK( dummyCanvasRenderer ); - - IntrusivePtr task = new Dali::Toolkit::Internal::CanvasRendererRasterizingTask(dummyInternalCanvasView, dummyCanvasRenderer); - DALI_TEST_CHECK( task ); - - Dali::Toolkit::Internal::CanvasViewRasterizeThread *dummyThread = new Dali::Toolkit::Internal::CanvasViewRasterizeThread(); - DALI_TEST_CHECK( dummyThread ); + Dali::Toolkit::CanvasView canvasView = Dali::Toolkit::CanvasView::New(Vector2(100, 100)); - dummyThread->AddTask(task); + Dali::CanvasRenderer dummyCanvasRenderer = Dali::CanvasRenderer::New(Vector2(100, 100)); + DALI_TEST_CHECK(dummyCanvasRenderer); - dummyThread->Process(false); + IntrusivePtr task = new Dali::Toolkit::Internal::CanvasRendererRasterizingTask(dummyCanvasRenderer, MakeCallback(rasteriztionCompleted)); + DALI_TEST_CHECK(task); - PixelData pixelData = CreatePixelData( 100, 100 ); + Dali::AsyncTaskManager asyncTaskManager = Dali::AsyncTaskManager::Get(); + DALI_TEST_CHECK(asyncTaskManager); - dummyThread->RasterizationCompletedSignal().Connect(dummyInternalCanvasView, &Dali::Toolkit::Internal::CanvasView::ApplyRasterizedImage); - dummyThread->RasterizationCompletedSignal().Emit(pixelData); + asyncTaskManager.AddTask(task); + DALI_TEST_EQUALS(Test::WaitForEventThreadTrigger(1), true, TEST_LOCATION); application.SendNotification(); application.Render(); + DALI_TEST_EQUALS(gRasterizationCompletedSignal, true, TEST_LOCATION); + END_TEST; } @@ -462,8 +383,8 @@ int UtcDaliCanvasViewSetSizeAndAddDrawable(void) { ToolkitTestApplication application; - CanvasView canvasView = CanvasView::New(Vector2(100,100)); - DALI_TEST_CHECK( canvasView ); + CanvasView canvasView = CanvasView::New(Vector2(100, 100)); + DALI_TEST_CHECK(canvasView); application.GetScene().Add(canvasView); @@ -481,7 +402,7 @@ int UtcDaliCanvasViewSetSizeAndAddDrawable(void) application.SendNotification(); application.Render(); - DALI_TEST_EQUALS( Test::WaitForEventThreadTrigger( 1 ), true, TEST_LOCATION ); + DALI_TEST_EQUALS(Test::WaitForEventThreadTrigger(1), true, TEST_LOCATION); application.SendNotification(); application.Render(); @@ -494,7 +415,7 @@ int UtcDaliCanvasViewViewBoxP(void) ToolkitTestApplication application; CanvasView canvasView = CanvasView::New(Vector2(300, 300)); - DALI_TEST_CHECK( canvasView ); + DALI_TEST_CHECK(canvasView); application.GetScene().Add(canvasView); @@ -512,7 +433,7 @@ int UtcDaliCanvasViewViewBoxN(void) ToolkitTestApplication application; CanvasView canvasView = CanvasView::New(Vector2(300, 300)); - DALI_TEST_CHECK( canvasView ); + DALI_TEST_CHECK(canvasView); application.GetScene().Add(canvasView); @@ -523,7 +444,7 @@ int UtcDaliCanvasViewViewBoxN(void) application.Render(); Vector2 viewBox = canvasView.GetProperty(Toolkit::CanvasView::Property::VIEW_BOX).Get(); - DALI_TEST_EQUALS( viewBox, Vector2(-999, -999), TEST_LOCATION ); + DALI_TEST_EQUALS(viewBox, Vector2(-999, -999), TEST_LOCATION); END_TEST; }