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-PageTurnView.cpp;h=85ba766fb4730754cc9342d6a3f61bebe13db3f8;hp=42b793945f28ebed9453822ec6fdc35a9e6e1fc9;hb=5e351965bad7e1de2e94027548b022bac692603c;hpb=a073ebfd862b49692c8e6d7dff2b128e62a4f6df diff --git a/automated-tests/src/dali-toolkit/utc-Dali-PageTurnView.cpp b/automated-tests/src/dali-toolkit/utc-Dali-PageTurnView.cpp index 42b7939..85ba766 100644 --- a/automated-tests/src/dali-toolkit/utc-Dali-PageTurnView.cpp +++ b/automated-tests/src/dali-toolkit/utc-Dali-PageTurnView.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. @@ -21,12 +21,10 @@ #include #include #include -#include -#include -#include -#include - - +#include +#include +#include +#include using namespace Dali; using namespace Dali::Toolkit; @@ -36,9 +34,6 @@ namespace const int RENDER_FRAME_INTERVAL = 16; ///< Duration of each frame in ms. (at approx 60FPS) const unsigned int TOTAL_PAGE_NUMBER = 20; const Vector2 PAGE_SIZE( 300.f,400.f ); -const unsigned int IMAGE_WIDTH = 30; -const unsigned int IMAGE_HEIGHT = 30; -const Vector2 IMAGE_SIZE( static_cast( IMAGE_WIDTH ), static_cast(IMAGE_HEIGHT) ); const Vector2 SPINE_SHADOW_PARAMETER( 60.0f, 30.0f ); static bool gObjectCreatedCallBackCalled; @@ -190,10 +185,10 @@ class TestPageFactory : public PageFactory { public: - TestPageFactory(ToolkitTestApplication& application) - : mApplication( application ) + TestPageFactory(ToolkitTestApplication& application, bool returnValidTexture = true ) + : mApplication( application ), + mValidTexture( returnValidTexture ) { - mSourceActors.resize(TOTAL_PAGE_NUMBER); mTotalPageNumber = TOTAL_PAGE_NUMBER; } @@ -207,41 +202,23 @@ public: } /** - * Create an image actor to represent a page. + * Create an texture 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 Texture NewPage( unsigned int pageId ) { - if(!mSourceActors[pageId]) + if( mValidTexture ) { - 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 Texture::New( Dali::TextureType::TEXTURE_2D, Pixel::RGB888, 100, 100 ); } - - return mSourceActors[pageId]; - } - - void DeletePage( unsigned int pageId ) - { - mSourceActors.erase( mSourceActors.begin() + pageId ); - mTotalPageNumber--; + return Texture(); // empty handle } private: ToolkitTestApplication& mApplication; - std::vector mSourceActors; unsigned int mTotalPageNumber; + bool mValidTexture; }; }// namespace @@ -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,42 @@ 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; +} + +int UtcDaliPageTurnEmptyTextureHandle(void) +{ + ToolkitTestApplication application; + + tet_infoline(" UtcDaliPageTurnEmptyTextureHandle "); + + application.GetGlAbstraction().SetCheckFramebufferStatusResult(GL_FRAMEBUFFER_COMPLETE ); + + TestPageFactory factory(application, false); // returns empty handles + Vector2 size = Stage::GetCurrent().GetSize(); + try + { + PageTurnView portraitView = PageTurnPortraitView::New( factory, size ); + portraitView.SetParentOrigin( ParentOrigin::CENTER ); + Stage::GetCurrent().Add( portraitView ); + + tet_result(TET_FAIL); + } + catch (DaliException& e) + { + DALI_TEST_ASSERT(e, "must pass in valid texture", TEST_LOCATION ); + } + catch (...) + { + tet_result(TET_FAIL); + } + + END_TEST; +} +