X-Git-Url: http://review.tizen.org/git/?a=blobdiff_plain;f=automated-tests%2Fsrc%2Fdali-toolkit%2Futc-Dali-PageTurnView.cpp;h=1142c4c186dc9fe104ed9becd3634bbf9aa4337e;hb=refs%2Fchanges%2F92%2F52692%2F17;hp=f2a631c77d78336de1684e4f877bde729b3e66a0;hpb=669373aecf093fe345b679b0ebe1e8056b12af2c;p=platform%2Fcore%2Fuifw%2Fdali-toolkit.git diff --git a/automated-tests/src/dali-toolkit/utc-Dali-PageTurnView.cpp b/automated-tests/src/dali-toolkit/utc-Dali-PageTurnView.cpp index f2a631c..1142c4c 100644 --- a/automated-tests/src/dali-toolkit/utc-Dali-PageTurnView.cpp +++ b/automated-tests/src/dali-toolkit/utc-Dali-PageTurnView.cpp @@ -21,6 +21,7 @@ #include #include #include +#include #include #include #include @@ -193,7 +194,6 @@ public: TestPageFactory(ToolkitTestApplication& application) : mApplication( application ) { - mSourceActors.resize(TOTAL_PAGE_NUMBER); mTotalPageNumber = TOTAL_PAGE_NUMBER; } @@ -207,40 +207,17 @@ public: } /** - * Create an image actor to represent a page. + * Create an image to represent a page content. * @param[in] pageId The ID of the page to create. - * @return An image actor, or an uninitialized pointer if the ID is out of range. + * @return An image, or an empty handle if the ID is out of range. */ - virtual Actor NewPage( unsigned int pageId ) + virtual Image NewPage( unsigned int pageId ) { - if(!mSourceActors[pageId]) - { - Actor actor = CreateSolidColorImageActor(mApplication, Color::BLUE,IMAGE_WIDTH,IMAGE_HEIGHT); - actor.SetName( static_cast( &(std::ostringstream() << pageId) )->str() ); - - actor.SetParentOrigin( ParentOrigin::CENTER ); - actor.SetAnchorPoint( AnchorPoint::CENTER ); - - ImageActor backPageActor = CreateSolidColorImageActor(mApplication, Color::BLUE,IMAGE_WIDTH,IMAGE_HEIGHT); - backPageActor.SetParentOrigin( ParentOrigin::CENTER ); - backPageActor.SetAnchorPoint( AnchorPoint::CENTER ); - actor.Add( backPageActor ); - - mSourceActors[pageId] = actor; - } - - return mSourceActors[pageId]; - } - - void DeletePage( unsigned int pageId ) - { - mSourceActors.erase( mSourceActors.begin() + pageId ); - mTotalPageNumber--; + return BufferImage::WHITE(); } private: ToolkitTestApplication& mApplication; - std::vector mSourceActors; unsigned int mTotalPageNumber; }; @@ -416,8 +393,8 @@ int UtcDaliPageTurnViewSetGetProperty(void) Stage::GetCurrent().Add( landscapeView ); - // Test "page-size" property - DALI_TEST_CHECK( landscapeView.GetPropertyIndex("page-size") == PageTurnView::Property::PAGE_SIZE ); + // Test "pageSize" property + DALI_TEST_CHECK( landscapeView.GetPropertyIndex("pageSize") == PageTurnView::Property::PAGE_SIZE ); DALI_TEST_EQUALS( landscapeView.GetProperty(PageTurnView::Property::PAGE_SIZE).Get(), PAGE_SIZE, TEST_LOCATION ); Vector2 newSize( PAGE_SIZE.x*0.75, PAGE_SIZE.y*0.5f ); @@ -431,8 +408,8 @@ int UtcDaliPageTurnViewSetGetProperty(void) Wait( application); DALI_TEST_EQUALS( Vector2(landscapeView.GetTargetSize()), Vector2(newSize.x*3.f, newSize.y*1.5f), TEST_LOCATION); - // Test "current-page-id" property - DALI_TEST_CHECK( landscapeView.GetPropertyIndex("current-page-id") == PageTurnView::Property::CURRENT_PAGE_ID ); + // Test "currentPageId" property + DALI_TEST_CHECK( landscapeView.GetPropertyIndex("currentPageId") == PageTurnView::Property::CURRENT_PAGE_ID ); DALI_TEST_EQUALS( landscapeView.GetProperty(PageTurnView::Property::CURRENT_PAGE_ID).Get(), 0, TEST_LOCATION ); int pageId = static_cast(TOTAL_PAGE_NUMBER)/3; @@ -442,8 +419,8 @@ int UtcDaliPageTurnViewSetGetProperty(void) landscapeView.SetProperty( PageTurnView::Property::CURRENT_PAGE_ID, pageId*2 ); DALI_TEST_EQUALS( landscapeView.GetProperty(PageTurnView::Property::CURRENT_PAGE_ID).Get(), pageId*2, TEST_LOCATION ); - // Test "spin-shadow" property - DALI_TEST_CHECK( landscapeView.GetPropertyIndex( "spine-shadow" ) == PageTurnView::Property::SPINE_SHADOW ); + // Test "spinShadow" property + DALI_TEST_CHECK( landscapeView.GetPropertyIndex( "spineShadow" ) == PageTurnView::Property::SPINE_SHADOW ); landscapeView.SetProperty( PageTurnView::Property::SPINE_SHADOW, SPINE_SHADOW_PARAMETER ); DALI_TEST_EQUALS( landscapeView.GetProperty(PageTurnView::Property::SPINE_SHADOW).Get(), SPINE_SHADOW_PARAMETER, TEST_LOCATION ); @@ -464,7 +441,7 @@ int UtcDaliPageTurnPortraitViewSignals(void) TestPageFactory factory(application); Vector2 size = Stage::GetCurrent().GetSize(); PageTurnView portraitView = PageTurnPortraitView::New( factory, size ); - portraitView.SetPositionInheritanceMode( USE_PARENT_POSITION ); + portraitView.SetParentOrigin( ParentOrigin::CENTER ); Stage::GetCurrent().Add( portraitView ); // Render and notify @@ -518,7 +495,7 @@ int UtcDaliPageTurnPortraitViewSignals(void) Wait(application, 1000); DALI_TEST_CHECK( callbackTurnFinished.mSignalVerified ); // the page is turned over - DALI_TEST_EQUALS( portraitView.GetProperty(PageTurnView::Property::CURRENT_PAGE_ID).Get(), pageIndex+1, TEST_LOCATION ); + DALI_TEST_EQUALS( portraitView.GetProperty(PageTurnView::Property::CURRENT_PAGE_ID).Get(), (int)(pageIndex+1), TEST_LOCATION ); //---Test 2: pan from position( size*0.5f ) to position( size.width, size.height*0.5f ) to position( size * 0.75f ), page 1 will bent then slid back--- callbackTurnStarted.Reset(); @@ -547,7 +524,7 @@ int UtcDaliPageTurnPortraitViewSignals(void) Wait(application, 1000); DALI_TEST_CHECK( callbackTurnFinished.mSignalVerified ); - DALI_TEST_EQUALS( portraitView.GetProperty(PageTurnView::Property::CURRENT_PAGE_ID).Get(), pageIndex, TEST_LOCATION ); // the page is not turned over + DALI_TEST_EQUALS( portraitView.GetProperty(PageTurnView::Property::CURRENT_PAGE_ID).Get(), (int)pageIndex, TEST_LOCATION ); // the page is not turned over // ----Test 3: pan 10 frames from position( size*0.25f ) to position( size.width*0.75f, size.height*0.25f ), the previous page will be turned backwards--- callbackTurnStarted.Reset(); @@ -584,7 +561,6 @@ int UtcDaliPageTurnLanscapeViewSignals(void) tet_infoline(" UtcDaliPageTurnLanscapeViewSignals "); application.GetGlAbstraction().SetCheckFramebufferStatusResult(GL_FRAMEBUFFER_COMPLETE ); - /*** * ----------------- * | | @@ -602,7 +578,7 @@ int UtcDaliPageTurnLanscapeViewSignals(void) TestPageFactory factory(application); Vector2 stageSize = Stage::GetCurrent().GetSize(); PageTurnView landscapeView = PageTurnLandscapeView::New( factory, Vector2(stageSize.x*0.5f, stageSize.x*0.8f) ); - landscapeView.SetPositionInheritanceMode( USE_PARENT_POSITION );; + landscapeView.SetParentOrigin( ParentOrigin::CENTER ); Stage::GetCurrent().Add( landscapeView ); // Render and notify @@ -656,7 +632,7 @@ int UtcDaliPageTurnLanscapeViewSignals(void) Wait(application, 1000); DALI_TEST_CHECK( callbackTurnFinished.mSignalVerified ); // the page is turned over - DALI_TEST_EQUALS( landscapeView.GetProperty(PageTurnView::Property::CURRENT_PAGE_ID).Get(), pageIndex+1, TEST_LOCATION ); + DALI_TEST_EQUALS( landscapeView.GetProperty(PageTurnView::Property::CURRENT_PAGE_ID).Get(), (int)(pageIndex+1), TEST_LOCATION ); //---Test 2: pan from position(stageSize.x * 0.15f, stageSize.y*0.5) to position(stageSize.x * 0.45f, stageSize.y*0.5) page 4 will be turned back--- callbackTurnStarted.Reset(); @@ -707,3 +683,11 @@ int UtcDaliPageTurnLanscapeViewSignals(void) DALI_TEST_EQUALS( landscapeView.GetProperty(PageTurnView::Property::CURRENT_PAGE_ID).Get(), 0, TEST_LOCATION ); END_TEST; } + +int UtcDaliPageImageFactoryGetExtention(void) +{ + ToolkitTestApplication application; + TestPageFactory factory(application); + DALI_TEST_CHECK( factory.GetExtension() == NULL ); + END_TEST; +}