From dacb29e11e7ec8568fec6d365338cfc86462537a Mon Sep 17 00:00:00 2001 From: Richard Huang Date: Fri, 22 May 2015 15:43:05 +0100 Subject: [PATCH 1/1] Added more test cases for ScrollView Change-Id: I5958113e9032139da7fcf03a31b5eec859fd2a28 --- .../src/dali-toolkit/utc-Dali-ScrollView.cpp | 67 ++++++++++++++++++++++ 1 file changed, 67 insertions(+) diff --git a/automated-tests/src/dali-toolkit/utc-Dali-ScrollView.cpp b/automated-tests/src/dali-toolkit/utc-Dali-ScrollView.cpp index c438865..fd01efe 100644 --- a/automated-tests/src/dali-toolkit/utc-Dali-ScrollView.cpp +++ b/automated-tests/src/dali-toolkit/utc-Dali-ScrollView.cpp @@ -1684,6 +1684,54 @@ int UtcDaliToolkitScrollViewRemoveAllEffectsN(void) END_TEST; } +int UtcDaliToolkitScrollViewSetOvershootEnabledP(void) +{ + ToolkitTestApplication application; + tet_infoline(" UtcDaliToolkitScrollViewSetOvershootEnabledP"); + + ScrollView scrollView = ScrollView::New(); + + scrollView.SetOvershootEnabled(true); + DALI_TEST_CHECK(scrollView.IsOvershootEnabled()); + + scrollView.SetOvershootEnabled(false); + DALI_TEST_CHECK(!scrollView.IsOvershootEnabled()); + + END_TEST; +} + +int UtcDaliToolkitScrollViewSetOvershootEffectColorP(void) +{ + ToolkitTestApplication application; + tet_infoline(" UtcDaliToolkitScrollViewSetOvershootEffectColorP"); + + ScrollView scrollView = ScrollView::New(); + + scrollView.SetOvershootEffectColor(Dali::Color::RED); + DALI_TEST_EQUALS(scrollView.GetOvershootEffectColor(), Dali::Color::RED, TEST_LOCATION); + + scrollView.SetOvershootEffectColor(Dali::Color::YELLOW); + DALI_TEST_EQUALS(scrollView.GetOvershootEffectColor(), Dali::Color::YELLOW, TEST_LOCATION); + + END_TEST; +} + +int UtcDaliToolkitScrollViewSetOvershootAnimationSpeedP(void) +{ + ToolkitTestApplication application; + tet_infoline(" UtcDaliToolkitScrollViewSetOvershootAnimationSpeedP"); + + ScrollView scrollView = ScrollView::New(); + + scrollView.SetOvershootAnimationSpeed(55.0f); + DALI_TEST_EQUALS(scrollView.GetOvershootAnimationSpeed(), 55.0f, TEST_LOCATION); + + scrollView.SetOvershootAnimationSpeed(120.0f); + DALI_TEST_EQUALS(scrollView.GetOvershootAnimationSpeed(), 120.0f, TEST_LOCATION); + + END_TEST; +} + int UtcDaliToolkitScrollViewGetSet(void) { ToolkitTestApplication application; @@ -1801,6 +1849,9 @@ int UtcDaliToolkitScrollViewFixedRulerConstructorP(void) RulerPtr fixedRuler = new FixedRuler( 100.0f ); DALI_TEST_CHECK( fixedRuler ); + fixedRuler = new FixedRuler( 0.0f ); + DALI_TEST_CHECK( fixedRuler ); + END_TEST; } @@ -1831,6 +1882,22 @@ int UtcDaliToolkitScrollViewRulerGetTypeP(void) END_TEST; } +int UtcDaliToolkitScrollViewRulerGetExtensionP(void) +{ + ToolkitTestApplication application; + tet_infoline(" UtcDaliToolkitScrollViewRulerGetExtensionP"); + + RulerPtr defaultRuler = new DefaultRuler(); + DALI_TEST_CHECK( defaultRuler ); + DALI_TEST_CHECK( !defaultRuler->GetExtension() ); + + RulerPtr fixedRuler = new FixedRuler( 100.0f ); + DALI_TEST_CHECK( fixedRuler ); + DALI_TEST_CHECK( !fixedRuler->GetExtension() ); + + END_TEST; +} + int UtcDaliToolkitScrollViewRulerEnableDisable(void) { ToolkitTestApplication application; -- 2.7.4