X-Git-Url: http://review.tizen.org/git/?a=blobdiff_plain;ds=sidebyside;f=automated-tests%2Fsrc%2Fdali-toolkit%2Futc-Dali-ScrollViewEffect.cpp;h=5cda4972adb04bf22aac8481e733b598f1ddff65;hb=834ddf7832598a57fc18c282371554a1ed8f0a78;hp=8e9224cc556a3a0b8ead1df0fd7a63319137c6ee;hpb=97b1d370bbe662d6f2b813252b281e77926aa037;p=platform%2Fcore%2Fuifw%2Fdali-toolkit.git diff --git a/automated-tests/src/dali-toolkit/utc-Dali-ScrollViewEffect.cpp b/automated-tests/src/dali-toolkit/utc-Dali-ScrollViewEffect.cpp index 8e9224c..5cda497 100644 --- a/automated-tests/src/dali-toolkit/utc-Dali-ScrollViewEffect.cpp +++ b/automated-tests/src/dali-toolkit/utc-Dali-ScrollViewEffect.cpp @@ -141,7 +141,7 @@ ScrollView SetupTestScrollView(int rows, int columns, Vector2 size) scrollView.SetSize(size); scrollView.SetAnchorPoint(AnchorPoint::CENTER); scrollView.SetParentOrigin(ParentOrigin::CENTER); - scrollView.ApplyConstraint( Constraint::New( Dali::Actor::SIZE, Dali::ParentSource( Dali::Actor::SIZE ), Dali::EqualToConstraint() ) ); + scrollView.ApplyConstraint( Constraint::New( Dali::Actor::Property::SIZE, Dali::ParentSource( Dali::Actor::Property::SIZE ), Dali::EqualToConstraint() ) ); scrollView.SetWrapMode(false); scrollView.ScrollStartedSignal().Connect( &OnScrollStart ); scrollView.ScrollUpdatedSignal().Connect( &OnScrollUpdate ); @@ -175,7 +175,7 @@ ScrollView SetupTestScrollView(int rows, int columns, Vector2 size) container.SetAnchorPoint(AnchorPoint::CENTER); container.SetSize( size ); scrollView.Add( container ); - container.ApplyConstraint( Constraint::New( Actor::SIZE, ParentSource( Actor::SIZE ), EqualToConstraint() ) ); + container.ApplyConstraint( Constraint::New( Actor::Property::SIZE, ParentSource( Actor::Property::SIZE ), EqualToConstraint() ) ); gPages.clear(); for(int row = 0;row( Actor::SIZE, ParentSource( Actor::SIZE ), EqualToConstraint() ) ); + page.ApplyConstraint( Constraint::New( Actor::Property::SIZE, ParentSource( Actor::Property::SIZE ), EqualToConstraint() ) ); page.SetParentOrigin( ParentOrigin::CENTER ); page.SetAnchorPoint( AnchorPoint::CENTER ); page.SetPosition( column * size.x, row * size.y ); @@ -267,27 +267,6 @@ int UtcDaliScrollViewSpiralEffectSetup(void) END_TEST; } - - - -int UtcDaliScrollViewSlideEffectSetup(void) -{ - tet_infoline(" UtcDaliScrollViewSlideEffectSetup"); - - ScrollViewSlideEffect effect; - - DALI_TEST_CHECK( !effect ); - - BaseHandle handle = ScrollViewSlideEffect::New(); - - DALI_TEST_CHECK( handle ); - - effect = ScrollViewSlideEffect::DownCast(handle); - - DALI_TEST_CHECK( effect ); - END_TEST; -} - int UtcDaliScrollViewCubeEffectTest(void) { ToolkitTestApplication application; @@ -343,7 +322,116 @@ int UtcDaliScrollViewSpiralEffectTest(void) { Actor page = *pageIter; page.RemoveConstraints(); - page.ApplyConstraint( Constraint::New( Actor::SIZE, ParentSource( Actor::SIZE ), EqualToConstraint() ) ); + page.ApplyConstraint( Constraint::New( Actor::Property::SIZE, ParentSource( Actor::Property::SIZE ), EqualToConstraint() ) ); + effect.ApplyToPage(page, Vector2(Math::PI_2, 0.0f)); + } + Wait(application); + + scrollView.ScrollTo(1); + while(!gOnScrollCompleteCalled) + { + Wait(application); + } + // test that the first page has reached centre of screen + Vector3 pagePos = testPage.GetCurrentPosition(); + DALI_TEST_EQUALS(pagePos, Vector3::ZERO, Math::MACHINE_EPSILON_0, TEST_LOCATION); + CleanupTest(); + END_TEST; +} + +int UtcDaliScrollViewPageCubeEffectSetup(void) +{ + tet_infoline(" UtcDaliScrollViewPageCubeEffectSetup"); + + ScrollViewPageCubeEffect effect; + + DALI_TEST_CHECK( !effect ); + + BaseHandle handle = ScrollViewPageCubeEffect::New(); + + DALI_TEST_CHECK( handle ); + + effect = ScrollViewPageCubeEffect::DownCast(handle); + + DALI_TEST_CHECK( effect ); + END_TEST; +} + + +int UtcDaliScrollViewPageCarouselEffectSetup(void) +{ + tet_infoline(" UtcDaliScrollViewCarouselEffectSetup"); + + ScrollViewPageCarouselEffect effect; + + DALI_TEST_CHECK( !effect ); + + BaseHandle handle = ScrollViewPageCarouselEffect::New(); + + DALI_TEST_CHECK( handle ); + + effect = ScrollViewPageCarouselEffect::DownCast(handle); + + DALI_TEST_CHECK( effect ); + END_TEST; +} + +int UtcDaliScrollViewCarouselEffectSetup(void) +{ + tet_infoline(" UtcDaliScrollViewCarouselEffectSetup"); + + ScrollViewCarouselEffect effect; + + DALI_TEST_CHECK( !effect ); + + BaseHandle handle = ScrollViewCarouselEffect::New(); + + DALI_TEST_CHECK( handle ); + + effect = ScrollViewCarouselEffect::DownCast(handle); + + DALI_TEST_CHECK( effect ); + END_TEST; +} + +int UtcDaliScrollViewDepthEffectSetup(void) +{ + tet_infoline(" UtcDaliScrollViewDepthEffectSetup"); + + ScrollViewDepthEffect effect; + + DALI_TEST_CHECK( !effect ); + + BaseHandle handle = ScrollViewDepthEffect::New(); + + DALI_TEST_CHECK( handle ); + + effect = ScrollViewDepthEffect::DownCast(handle); + + DALI_TEST_CHECK( effect ); + END_TEST; +} + + +int UtcDaliScrollViewPageCubeEffectTest(void) +{ + ToolkitTestApplication application; + tet_infoline(" UtcDaliScrollViewPageCubeEffectTest"); + + Vector2 size = Stage::GetCurrent().GetSize(); + + ScrollView scrollView = SetupTestScrollView(1, 3, size); + Actor testPage = gPages[1]; + Wait(application, 500); + + ScrollViewPageCubeEffect effect = ScrollViewPageCubeEffect::New(); + scrollView.ApplyEffect(effect); + + for(ActorIter pageIter = gPages.begin(); pageIter != gPages.end(); ++pageIter) + { + Actor page = *pageIter; + page.RemoveConstraints(); + page.ApplyConstraint( Constraint::New( Actor::Property::SIZE, ParentSource( Actor::Property::SIZE ), EqualToConstraint() ) ); effect.ApplyToPage(page, Vector2(Math::PI_2, 0.0f)); } Wait(application); @@ -360,35 +448,98 @@ int UtcDaliScrollViewSpiralEffectTest(void) END_TEST; } +int UtcDaliScrollViewPageCarouselEffectTest(void) +{ + ToolkitTestApplication application; + tet_infoline(" UtcDaliScrollViewPageCarouselEffectTest"); + + Vector2 size = Stage::GetCurrent().GetSize(); + + ScrollView scrollView = SetupTestScrollView(1, 3, size); + Actor testPage = gPages[1]; + Wait(application, 500); + + ScrollViewPageCarouselEffect effect = ScrollViewPageCarouselEffect::New(); + scrollView.ApplyEffect(effect); + + for(ActorIter pageIter = gPages.begin(); pageIter != gPages.end(); ++pageIter) + { + Actor page = *pageIter; + page.RemoveConstraints(); + page.ApplyConstraint( Constraint::New( Actor::Property::SIZE, ParentSource( Actor::Property::SIZE ), EqualToConstraint() ) ); + effect.ApplyToPage(page); + } + Wait(application); + scrollView.ScrollTo(1, 0.5f, DirectionBiasNone); + while(!gOnScrollCompleteCalled) + { + Wait(application); + } + // test that the first page has reached centre of screen + Vector3 pagePos = testPage.GetCurrentPosition(); + DALI_TEST_EQUALS(pagePos, Vector3::ZERO, Math::MACHINE_EPSILON_0, TEST_LOCATION); + CleanupTest(); + END_TEST; +} -int UtcDaliScrollViewSlideEffectTest(void) +int UtcDaliScrollViewCarouselEffectTest(void) { ToolkitTestApplication application; - tet_infoline(" UtcDaliScrollViewSlideEffectTest"); + tet_infoline(" UtcDaliScrollViewCarouselEffectTest"); Vector2 size = Stage::GetCurrent().GetSize(); - Vector3 pageSize(size.x, size.y, 0.0f); ScrollView scrollView = SetupTestScrollView(1, 3, size); Actor testPage = gPages[1]; Wait(application, 500); - ScrollViewSlideEffect effect = ScrollViewSlideEffect::New(); - effect.SetDelayReferenceOffset(pageSize * 0.25); - DALI_TEST_EQUALS(effect.GetDelayReferenceOffset(), pageSize * 0.25, Math::MACHINE_EPSILON_0, TEST_LOCATION); - effect.SetMaxDelayDuration(0.5f); - DALI_TEST_EQUALS(effect.GetMaxDelayDuration(), 0.5f, Math::MACHINE_EPSILON_0, TEST_LOCATION); - effect.SetSlideDirection(false); - DALI_TEST_CHECK(!effect.GetSlideDirection()); + ScrollViewCarouselEffect effect = ScrollViewCarouselEffect::New(); + scrollView.ApplyEffect(effect); + + Actor actor = AddActorToPage(testPage, 0.5f, 0.5f, 3, 3); + Wait(application); + Vector3 actorPrePosition = actor.GetCurrentPosition(); + + effect.ApplyToActor( actor, Vector2(1.2f, 1.2f) ); + scrollView.ScrollTo(Vector3(size.x, 0.0f, 0.0f), 0.5f, DirectionBiasNone, DirectionBiasNone); + while(!gOnScrollCompleteCalled) + { + Wait(application); + } + // test that the first page has reached centre of screen + Vector3 actorPostPosition = actor.GetCurrentPosition(); + // just check the actor has moved + DALI_TEST_CHECK((actorPostPosition - actorPrePosition).Length() > Math::MACHINE_EPSILON_1); + CleanupTest(); + END_TEST; +} + +int UtcDaliScrollViewDepthEffectTest(void) +{ + ToolkitTestApplication application; + tet_infoline(" UtcDaliScrollViewDepthEffectTest"); + + Vector2 size = Stage::GetCurrent().GetSize(); + + ScrollView scrollView = SetupTestScrollView(1, 3, size); + Actor testPage = gPages[1]; + Wait(application, 500); + + ScrollViewDepthEffect effect = ScrollViewDepthEffect::New(); scrollView.ApplyEffect(effect); Actor actor = AddActorToPage(testPage, 0.5f, 0.5f, 3, 3); Wait(application); Vector3 actorPrePosition = actor.GetCurrentPosition(); - effect.ApplyToActor(actor, 0.0f, 0.5f); + const Vector2 positionExtent(0.5f, 2.5f); + const Vector2 offsetExtent(1.0f, 1.0f); + const float positionScale(1.5f); + const float scaleExtent(0.5f); + + effect.ApplyToActor( actor, positionExtent, offsetExtent, positionScale, scaleExtent ); scrollView.ScrollTo(1); while(!gOnScrollCompleteCalled)