X-Git-Url: http://review.tizen.org/git/?p=platform%2Fcore%2Fuifw%2Fdali-toolkit.git;a=blobdiff_plain;f=automated-tests%2Fsrc%2Fdali-toolkit-internal%2Futc-Dali-AddOns.cpp;h=bc82cac3ec86afff3d0ceb9e3042df205e046c0f;hp=195656da00146571319a0789fa67725106c4cc69;hb=bdeb351ea382b8cd49404cf197a1945c24289f79;hpb=d8a4571d975ae061fe32f1d098d07ccc94604729 diff --git a/automated-tests/src/dali-toolkit-internal/utc-Dali-AddOns.cpp b/automated-tests/src/dali-toolkit-internal/utc-Dali-AddOns.cpp index 195656d..bc82cac 100644 --- a/automated-tests/src/dali-toolkit-internal/utc-Dali-AddOns.cpp +++ b/automated-tests/src/dali-toolkit-internal/utc-Dali-AddOns.cpp @@ -30,7 +30,7 @@ namespace const char* TEST_IMAGE_FILE_NAME = TEST_RESOURCE_DIR "/application-icon-20.png"; const char* TEST_IMAGE_FILE_NAME_9 = TEST_RESOURCE_DIR "/heartsframe.9.png"; - +const char* TEST_IMAGE_FILE_NAME2_9 = TEST_RESOURCE_DIR "/button-up.9.png"; int CountFunctionCalls( const std::vector& callstack, const std::string& function ) { int counter = 0; @@ -72,13 +72,20 @@ int UtcRenderingAddOnTestP(void) imageView2.SetProperty( Actor::Property::PARENT_ORIGIN, ParentOrigin::TOP_LEFT ); imageView2.SetProperty( Actor::Property::ANCHOR_POINT, AnchorPoint::TOP_LEFT ); + // Load npatch image view + auto imageView3 = Dali::Toolkit::ImageView::New( TEST_IMAGE_FILE_NAME2_9 ); + imageView3.SetProperty( Actor::Property::SIZE, Vector2( 400.f, 60.f ) ); + imageView3.SetProperty( Actor::Property::PARENT_ORIGIN, ParentOrigin::TOP_LEFT ); + imageView3.SetProperty( Actor::Property::ANCHOR_POINT, AnchorPoint::TOP_LEFT ); + application.GetScene().Add( imageView ); application.GetScene().Add( imageView2 ); + application.GetScene().Add( imageView3 ); application.SendNotification(); application.Render(); - DALI_TEST_EQUALS( ::Test::WaitForEventThreadTrigger( 2 ), true, TEST_LOCATION ); + DALI_TEST_EQUALS( ::Test::WaitForEventThreadTrigger( 3 ), true, TEST_LOCATION ); application.SendNotification(); application.Render(); @@ -87,8 +94,8 @@ int UtcRenderingAddOnTestP(void) DALI_TEST_EQUALS( CountFunctionCalls( callstack, "GetGeometry" ), 2, TEST_LOCATION); DALI_TEST_EQUALS( CountFunctionCalls( callstack, "CreateGeometry" ), 1, TEST_LOCATION); - DALI_TEST_EQUALS( CountFunctionCalls( callstack, "CreateGeometryGrid" ), 1, TEST_LOCATION); - DALI_TEST_EQUALS( CountFunctionCalls( callstack, "BuildNPatch" ), 1, TEST_LOCATION); + DALI_TEST_EQUALS( CountFunctionCalls( callstack, "CreateGeometryGrid" ), 2, TEST_LOCATION); + DALI_TEST_EQUALS( CountFunctionCalls( callstack, "BuildNPatch" ), 2, TEST_LOCATION); delete addOnManager;