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-ScrollBar.cpp;h=c287c5e9555f7e94bd880ae7f23acc20e15020e8;hp=95b784d3a7d8aa096de106f3f2ecfcc5589e527a;hb=268f651469300b3950b3f314fa33803b6c24273e;hpb=dfebb1e3da197e21bd7f4424ab65884b98f42fea diff --git a/automated-tests/src/dali-toolkit/utc-Dali-ScrollBar.cpp b/automated-tests/src/dali-toolkit/utc-Dali-ScrollBar.cpp index 95b784d..c287c5e 100644 --- a/automated-tests/src/dali-toolkit/utc-Dali-ScrollBar.cpp +++ b/automated-tests/src/dali-toolkit/utc-Dali-ScrollBar.cpp @@ -1,5 +1,5 @@ /* - * Copyright (c) 2015 Samsung Electronics Co., Ltd. + * Copyright (c) 2020 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. @@ -19,9 +19,10 @@ #include #include #include +#include "dali-toolkit-test-utils/toolkit-timer.h" #include -#include -#include +#include +#include using namespace Dali; using namespace Toolkit; @@ -41,48 +42,6 @@ namespace const int RENDER_FRAME_INTERVAL = 16; ///< Duration of each frame in ms. (at approx 60FPS) -// Generate a PanGestureEvent to send to Core -Integration::PanGestureEvent GeneratePan( - Gesture::State state, - const Vector2& previousPosition, - const Vector2& currentPosition, - unsigned long timeDelta, - unsigned int numberOfTouches = 1) -{ - Integration::PanGestureEvent pan(state); - - pan.previousPosition = previousPosition; - pan.currentPosition = currentPosition; - pan.timeDelta = timeDelta; - pan.numberOfTouches = numberOfTouches; - - return pan; -} - -/** - * Helper to generate PanGestureEvent - * - * @param[in] application Application instance - * @param[in] state The Gesture State - * @param[in] pos The current position of touch. - */ -static void SendPan(ToolkitTestApplication& application, Gesture::State state, const Vector2& pos) -{ - static Vector2 last; - - if( (state == Gesture::Started) || - (state == Gesture::Possible) ) - { - last.x = pos.x; - last.y = pos.y; - } - - application.ProcessEvent(GeneratePan(state, last, pos, RENDER_FRAME_INTERVAL)); - - last.x = pos.x; - last.y = pos.y; -} - /* * Simulate time passed by. * @@ -144,25 +103,31 @@ static void OnScrollPositionIntervalReached( float position ) gOnScrollPositionIntervalReachedSignalCalled = true; } -static Vector2 PerformGestureSwipe(ToolkitTestApplication& application, Vector2 start, Vector2 direction, int frames) +static Vector2 PerformGestureSwipe(ToolkitTestApplication& application, Vector2 start, Vector2 direction, int frames, uint32_t start_time) { gOnPanFinishedCalled = false; // Now do a pan starting from (start) and heading (direction) - Vector2 pos(start); - SendPan(application, Gesture::Possible, pos); - SendPan(application, Gesture::Started, pos); + Vector2 pos( start + ( direction * 15 ) ); + uint32_t time = start_time; + + TestStartPan( application, start, pos, time ); + Wait(application); for(int i = 0; i < frames; i++) { + Test::EmitGlobalTimerSignal(); + pos += direction; // Move in this direction - SendPan(application, Gesture::Continuing, pos); + time += RENDER_FRAME_INTERVAL; + TestMovePan( application, pos, time); Wait(application); } pos += direction; // Move in this direction. - SendPan(application, Gesture::Finished, pos); + time += RENDER_FRAME_INTERVAL; + TestEndPan(application, pos, time ); Wait(application); return pos; @@ -224,20 +189,20 @@ int UtcDaliToolkitScrollBarNewP(void) DALI_TEST_CHECK( scrollBar ); END_TEST; - ScrollBar vertical = ScrollBar::New(ScrollBar::Vertical); + ScrollBar vertical = ScrollBar::New(ScrollBar::VERTICAL); DALI_TEST_CHECK( vertical ); - DALI_TEST_CHECK( vertical.GetScrollDirection() == ScrollBar::Vertical ); + DALI_TEST_CHECK( vertical.GetScrollDirection() == ScrollBar::VERTICAL ); Property::Value value = vertical.GetProperty(ScrollBar::Property::SCROLL_DIRECTION); std::string scrollDirection = value.Get(); - DALI_TEST_EQUALS( scrollDirection, "Vertical", TEST_LOCATION ); + DALI_TEST_EQUALS( scrollDirection, "VERTICAL", TEST_LOCATION ); - ScrollBar horizontal = ScrollBar::New(ScrollBar::Horizontal); + ScrollBar horizontal = ScrollBar::New(ScrollBar::HORIZONTAL); DALI_TEST_CHECK( horizontal ); - DALI_TEST_CHECK( horizontal.GetScrollDirection() == ScrollBar::Horizontal ); + DALI_TEST_CHECK( horizontal.GetScrollDirection() == ScrollBar::HORIZONTAL ); value = vertical.GetProperty(ScrollBar::Property::SCROLL_DIRECTION); scrollDirection = value.Get(); - DALI_TEST_EQUALS( scrollDirection, "Horizontal", TEST_LOCATION ); + DALI_TEST_EQUALS( scrollDirection, "HORIZONTAL", TEST_LOCATION ); END_TEST; } @@ -258,17 +223,17 @@ int UtcDaliToolkitScrollBarCreateP(void) ScrollBar scrollBar = ScrollBar::DownCast( handle ); DALI_TEST_CHECK( scrollBar ); - scrollBar.SetProperty(ScrollBar::Property::SCROLL_DIRECTION, "Vertical"); - scrollBar.SetProperty(ScrollBar::Property::INDICATOR_HEIGHT_POLICY, "Fixed"); + scrollBar.SetProperty(ScrollBar::Property::SCROLL_DIRECTION, "VERTICAL"); + scrollBar.SetProperty(ScrollBar::Property::INDICATOR_HEIGHT_POLICY, "FIXED"); - DALI_TEST_EQUALS( scrollBar.GetScrollDirection(), Toolkit::ScrollBar::Vertical, TEST_LOCATION ); - DALI_TEST_EQUALS( scrollBar.GetIndicatorHeightPolicy(), Toolkit::ScrollBar::Fixed, TEST_LOCATION ); + DALI_TEST_EQUALS( scrollBar.GetScrollDirection(), Toolkit::ScrollBar::VERTICAL, TEST_LOCATION ); + DALI_TEST_EQUALS( scrollBar.GetIndicatorHeightPolicy(), Toolkit::ScrollBar::FIXED, TEST_LOCATION ); - scrollBar.SetProperty(ScrollBar::Property::SCROLL_DIRECTION, "Horizontal"); - scrollBar.SetProperty(ScrollBar::Property::INDICATOR_HEIGHT_POLICY, "Variable"); + scrollBar.SetProperty(ScrollBar::Property::SCROLL_DIRECTION, "HORIZONTAL"); + scrollBar.SetProperty(ScrollBar::Property::INDICATOR_HEIGHT_POLICY, "VARIABLE"); - DALI_TEST_EQUALS( scrollBar.GetScrollDirection(), Toolkit::ScrollBar::Horizontal, TEST_LOCATION ); - DALI_TEST_EQUALS( scrollBar.GetIndicatorHeightPolicy(), Toolkit::ScrollBar::Variable, TEST_LOCATION ); + DALI_TEST_EQUALS( scrollBar.GetScrollDirection(), Toolkit::ScrollBar::HORIZONTAL, TEST_LOCATION ); + DALI_TEST_EQUALS( scrollBar.GetIndicatorHeightPolicy(), Toolkit::ScrollBar::VARIABLE, TEST_LOCATION ); END_TEST; } @@ -306,17 +271,17 @@ int UtcDaliToolkitScrollBarSetScrollPropertySourceP(void) ToolkitTestApplication application; // Create a vertical scroll bar - ScrollBar scrollBar = ScrollBar::New(ScrollBar::Vertical); + ScrollBar scrollBar = ScrollBar::New(ScrollBar::VERTICAL); DALI_TEST_CHECK( scrollBar ); - DALI_TEST_CHECK( scrollBar.GetScrollDirection() == ScrollBar::Vertical ); + DALI_TEST_CHECK( scrollBar.GetScrollDirection() == ScrollBar::VERTICAL ); float scrollBarHeight = 100.0f; - scrollBar.SetSize(20.0f, scrollBarHeight, 0.0f); - Stage::GetCurrent().Add( scrollBar ); + scrollBar.SetProperty( Actor::Property::SIZE, Vector3(20.0f, scrollBarHeight, 0.0f) ); + application.GetScene().Add( scrollBar ); // Create a source actor that owns the scroll properties required by the scroll bar Actor sourceActor = Actor::New(); - Stage::GetCurrent().Add( sourceActor ); + application.GetScene().Add( sourceActor ); // Register the scroll properties Property::Index propertyScrollPosition = sourceActor.RegisterProperty( "sourcePosition", 0.0f ); @@ -341,7 +306,7 @@ int UtcDaliToolkitScrollBarSetScrollPropertySourceP(void) // Check that the indicator size should be: scroll bar size * (scroll bar size / content size). // i.e. The bigger the content size, the smaller the indicator size - float indicatorHeight = indicator.GetCurrentSize().y; + float indicatorHeight = indicator.GetCurrentProperty< Vector3 >( Actor::Property::SIZE ).y; DALI_TEST_EQUALS( indicatorHeight, scrollBarHeight * scrollBarHeight / 500.0f, TEST_LOCATION ); // Decrease the content length @@ -352,11 +317,11 @@ int UtcDaliToolkitScrollBarSetScrollPropertySourceP(void) application.Render(); // Check that the indicator size is changed accordingly - indicatorHeight = indicator.GetCurrentSize().y; + indicatorHeight = indicator.GetCurrentProperty< Vector3 >( Actor::Property::SIZE ).y; DALI_TEST_EQUALS( indicatorHeight, scrollBarHeight * scrollBarHeight / 250.0f, TEST_LOCATION ); // As scroll position is 0, check that the indicator position should be 0.0f. - float indicatorPosition = indicator.GetCurrentPosition().y; + float indicatorPosition = indicator.GetCurrentProperty< Vector3 >( Actor::Property::POSITION ).y; DALI_TEST_EQUALS( indicatorPosition, 0.0f, TEST_LOCATION ); // Set the scroll position to the middle @@ -367,7 +332,7 @@ int UtcDaliToolkitScrollBarSetScrollPropertySourceP(void) application.Render(); // Check that the indicator should be in the middle of the scroll bar - indicatorPosition = indicator.GetCurrentPosition().y; + indicatorPosition = indicator.GetCurrentProperty< Vector3 >( Actor::Property::POSITION ).y; DALI_TEST_EQUALS( indicatorPosition, (scrollBarHeight - indicatorHeight) * 0.5f, TEST_LOCATION ); // Set the scroll position to the maximum @@ -378,7 +343,7 @@ int UtcDaliToolkitScrollBarSetScrollPropertySourceP(void) application.Render(); // Check that the indicator should be in the end of the scroll bar - indicatorPosition = indicator.GetCurrentPosition().y; + indicatorPosition = indicator.GetCurrentProperty< Vector3 >( Actor::Property::POSITION ).y; DALI_TEST_EQUALS( indicatorPosition, scrollBarHeight - indicatorHeight, TEST_LOCATION ); // Increase the maximum scroll position to double @@ -389,12 +354,12 @@ int UtcDaliToolkitScrollBarSetScrollPropertySourceP(void) application.Render(); // Check that the indicator should be now in the middle of the scroll bar - indicatorPosition = indicator.GetCurrentPosition().y; + indicatorPosition = indicator.GetCurrentProperty< Vector3 >( Actor::Property::POSITION ).y; DALI_TEST_EQUALS( indicatorPosition, (scrollBarHeight - indicatorHeight) * 0.5f, TEST_LOCATION ); // Create another source actor Actor newSourceActor = Actor::New(); - Stage::GetCurrent().Add( newSourceActor ); + application.GetScene().Add( newSourceActor ); // Register the scroll properties Property::Index newPropertyScrollPosition = newSourceActor.RegisterProperty( "sourcePosition", 0.0f ); @@ -415,11 +380,11 @@ int UtcDaliToolkitScrollBarSetScrollPropertySourceP(void) application.Render(); // Check that the indicator size is changed accordingly - indicatorHeight = indicator.GetCurrentSize().y; + indicatorHeight = indicator.GetCurrentProperty< Vector3 >( Actor::Property::SIZE ).y; DALI_TEST_EQUALS( indicatorHeight, scrollBarHeight * scrollBarHeight / 400.0f, TEST_LOCATION ); // Check that the indicator position goes back to the beginning of the scroll bar - indicatorPosition = indicator.GetCurrentPosition().y; + indicatorPosition = indicator.GetCurrentProperty< Vector3 >( Actor::Property::POSITION ).y; DALI_TEST_EQUALS( indicatorPosition, 0.0f, TEST_LOCATION ); // Set the scroll position to one fifth of the maximum @@ -430,7 +395,7 @@ int UtcDaliToolkitScrollBarSetScrollPropertySourceP(void) application.Render(); // Check that the indicator should be in one fifth from the beginning of the scroll bar - indicatorPosition = indicator.GetCurrentPosition().y; + indicatorPosition = indicator.GetCurrentProperty< Vector3 >( Actor::Property::POSITION ).y; DALI_TEST_EQUALS( indicatorPosition, (scrollBarHeight - indicatorHeight) * 0.2f, TEST_LOCATION ); END_TEST; @@ -551,14 +516,14 @@ int UtcDaliToolkitScrollBarSetScrollPositionIntervalsP(void) ToolkitTestApplication application; // Create a vertical scroll bar - ScrollBar scrollBar = ScrollBar::New(ScrollBar::Vertical); + ScrollBar scrollBar = ScrollBar::New(ScrollBar::VERTICAL); DALI_TEST_CHECK( scrollBar ); - scrollBar.SetParentOrigin(ParentOrigin::TOP_LEFT); - scrollBar.SetAnchorPoint(AnchorPoint::TOP_LEFT); - scrollBar.SetSize(20.0f, 800.0f, 0.0f); + scrollBar.SetProperty( Actor::Property::PARENT_ORIGIN,ParentOrigin::TOP_LEFT); + scrollBar.SetProperty( Actor::Property::ANCHOR_POINT,AnchorPoint::TOP_LEFT); + scrollBar.SetProperty( Actor::Property::SIZE, Vector3(20.0f, 800.0f, 0.0f) ); - Stage::GetCurrent().Add( scrollBar ); + application.GetScene().Add( scrollBar ); // Connect to the ScrollPositionIntervalReached signal scrollBar.ScrollPositionIntervalReachedSignal().Connect( &OnScrollPositionIntervalReached ); @@ -569,7 +534,7 @@ int UtcDaliToolkitScrollBarSetScrollPositionIntervalsP(void) // Create a source actor that owns the scroll properties required by the scroll bar Actor sourceActor = Actor::New(); - Stage::GetCurrent().Add( sourceActor ); + application.GetScene().Add( sourceActor ); // Register the scroll properties Property::Index propertyScrollPosition = sourceActor.RegisterProperty( "sourcePosition", 0.0f ); @@ -671,7 +636,7 @@ int UtcDaliToolkitScrollBarGetScrollPositionIntervalsP(void) ToolkitTestApplication application; // Create a vertical scroll bar - ScrollBar scrollBar = ScrollBar::New(ScrollBar::Vertical); + ScrollBar scrollBar = ScrollBar::New(ScrollBar::VERTICAL); DALI_TEST_CHECK( scrollBar ); // Set the values to get notified when the scroll positions of the source actor goes above or below these values @@ -698,6 +663,20 @@ int UtcDaliToolkitScrollBarGetScrollPositionIntervalsP(void) DALI_TEST_EQUALS( positionIntervals[8], results[8], TEST_LOCATION ); DALI_TEST_EQUALS( positionIntervals[9], results[9], TEST_LOCATION ); + Property::Array resultArray = scrollBar.GetProperty(Toolkit::ScrollBar::Property::SCROLL_POSITION_INTERVALS); + + DALI_TEST_EQUALS( positionIntervals.Count(), resultArray.Count(), TEST_LOCATION ); + DALI_TEST_EQUALS( positionIntervals[0], resultArray[0].Get(), TEST_LOCATION ); + DALI_TEST_EQUALS( positionIntervals[1], resultArray[1].Get(), TEST_LOCATION ); + DALI_TEST_EQUALS( positionIntervals[2], resultArray[2].Get(), TEST_LOCATION ); + DALI_TEST_EQUALS( positionIntervals[3], resultArray[3].Get(), TEST_LOCATION ); + DALI_TEST_EQUALS( positionIntervals[4], resultArray[4].Get(), TEST_LOCATION ); + DALI_TEST_EQUALS( positionIntervals[5], resultArray[5].Get(), TEST_LOCATION ); + DALI_TEST_EQUALS( positionIntervals[6], resultArray[6].Get(), TEST_LOCATION ); + DALI_TEST_EQUALS( positionIntervals[7], resultArray[7].Get(), TEST_LOCATION ); + DALI_TEST_EQUALS( positionIntervals[8], resultArray[8].Get(), TEST_LOCATION ); + DALI_TEST_EQUALS( positionIntervals[9], resultArray[9].Get(), TEST_LOCATION ); + END_TEST; } @@ -706,13 +685,13 @@ int UtcDaliToolkitScrollBarGetScrollDirectionP(void) ToolkitTestApplication application; // Create a vertical scroll bar - ScrollBar scrollBar = ScrollBar::New(ScrollBar::Vertical); + ScrollBar scrollBar = ScrollBar::New(ScrollBar::VERTICAL); DALI_TEST_CHECK( scrollBar ); - DALI_TEST_CHECK( scrollBar.GetScrollDirection() == ScrollBar::Vertical ); + DALI_TEST_CHECK( scrollBar.GetScrollDirection() == ScrollBar::VERTICAL ); // Change the direction of scroll bar to horizontal - scrollBar.SetScrollDirection(ScrollBar::Horizontal); - DALI_TEST_CHECK( scrollBar.GetScrollDirection() == ScrollBar::Horizontal ); + scrollBar.SetScrollDirection(ScrollBar::HORIZONTAL); + DALI_TEST_CHECK( scrollBar.GetScrollDirection() == ScrollBar::HORIZONTAL ); END_TEST; } @@ -726,12 +705,12 @@ int UtcDaliToolkitScrollBarSetIndicatorHeightPolicyP(void) DALI_TEST_CHECK( scrollBar ); float scrollBarHeight = 100.0f; - scrollBar.SetSize(20.0f, scrollBarHeight, 0.0f); - Stage::GetCurrent().Add( scrollBar ); + scrollBar.SetProperty( Actor::Property::SIZE, Vector3(20.0f, scrollBarHeight, 0.0f) ); + application.GetScene().Add( scrollBar ); // Create a source actor that owns the scroll properties required by the scroll bar Actor sourceActor = Actor::New(); - Stage::GetCurrent().Add( sourceActor ); + application.GetScene().Add( sourceActor ); // Register the scroll properties Property::Index propertyScrollPosition = sourceActor.RegisterProperty( "sourcePosition", 0.0f ); @@ -756,35 +735,35 @@ int UtcDaliToolkitScrollBarSetIndicatorHeightPolicyP(void) // Check that the indicator size should be: scroll bar size * (scroll bar size / content size). // i.e. The bigger the content size, the smaller the indicator size - float indicatorHeight = indicator.GetCurrentSize().y; + float indicatorHeight = indicator.GetCurrentProperty< Vector3 >( Actor::Property::SIZE ).y; DALI_TEST_EQUALS( indicatorHeight, scrollBarHeight * scrollBarHeight / 500.0f, TEST_LOCATION ); // Set the indicator height to be fixed to 50.0f - scrollBar.SetIndicatorHeightPolicy(Toolkit::ScrollBar::Fixed); + scrollBar.SetIndicatorHeightPolicy(Toolkit::ScrollBar::FIXED); scrollBar.SetIndicatorFixedHeight(50.0f); Property::Value value = scrollBar.GetProperty(ScrollBar::Property::INDICATOR_HEIGHT_POLICY); - DALI_TEST_EQUALS(value.Get(), "Fixed", TEST_LOCATION ); + DALI_TEST_EQUALS(value.Get(), "FIXED", TEST_LOCATION ); // Render and notify application.SendNotification(); application.Render(); // Check that the indicator size should be 50.0f - indicatorHeight = indicator.GetCurrentSize().y; + indicatorHeight = indicator.GetCurrentProperty< Vector3 >( Actor::Property::SIZE ).y; DALI_TEST_EQUALS( indicatorHeight, 50.0f, TEST_LOCATION ); // Set the indicator height to be variable - scrollBar.SetIndicatorHeightPolicy(Toolkit::ScrollBar::Variable); + scrollBar.SetIndicatorHeightPolicy(Toolkit::ScrollBar::VARIABLE); value = scrollBar.GetProperty(ScrollBar::Property::INDICATOR_HEIGHT_POLICY); - DALI_TEST_EQUALS(value.Get(), "Variable", TEST_LOCATION ); + DALI_TEST_EQUALS(value.Get(), "VARIABLE", TEST_LOCATION ); // Render and notify application.SendNotification(); application.Render(); // Check that the indicator size should be: scroll bar size * (scroll bar size / content size). - indicatorHeight = indicator.GetCurrentSize().y; + indicatorHeight = indicator.GetCurrentProperty< Vector3 >( Actor::Property::SIZE ).y; DALI_TEST_EQUALS( indicatorHeight, scrollBarHeight * scrollBarHeight / 500.0f, TEST_LOCATION ); END_TEST; @@ -799,12 +778,12 @@ int UtcDaliToolkitScrollBarGetIndicatorHeightPolicyP(void) DALI_TEST_CHECK( scrollBar ); // Set the indicator height to be fixed - scrollBar.SetIndicatorHeightPolicy(Toolkit::ScrollBar::Fixed); - DALI_TEST_EQUALS( scrollBar.GetIndicatorHeightPolicy(), Toolkit::ScrollBar::Fixed, TEST_LOCATION ); + scrollBar.SetIndicatorHeightPolicy(Toolkit::ScrollBar::FIXED); + DALI_TEST_EQUALS( scrollBar.GetIndicatorHeightPolicy(), Toolkit::ScrollBar::FIXED, TEST_LOCATION ); // Set the indicator height to be variable - scrollBar.SetIndicatorHeightPolicy(Toolkit::ScrollBar::Variable); - DALI_TEST_EQUALS( scrollBar.GetIndicatorHeightPolicy(), Toolkit::ScrollBar::Variable, TEST_LOCATION ); + scrollBar.SetIndicatorHeightPolicy(Toolkit::ScrollBar::VARIABLE); + DALI_TEST_EQUALS( scrollBar.GetIndicatorHeightPolicy(), Toolkit::ScrollBar::VARIABLE, TEST_LOCATION ); END_TEST; } @@ -818,14 +797,14 @@ int UtcDaliToolkitScrollBarSetIndicatorFixedHeightP(void) DALI_TEST_CHECK( scrollBar ); float scrollBarHeight = 100.0f; - scrollBar.SetSize(20.0f, scrollBarHeight, 0.0f); - Stage::GetCurrent().Add( scrollBar ); + scrollBar.SetProperty( Actor::Property::SIZE, Vector3(20.0f, scrollBarHeight, 0.0f) ); + application.GetScene().Add( scrollBar ); Actor indicator = scrollBar.GetScrollIndicator(); DALI_TEST_CHECK( indicator ); // Set the indicator height to be fixed to 50.0f - scrollBar.SetIndicatorHeightPolicy(Toolkit::ScrollBar::Fixed); + scrollBar.SetIndicatorHeightPolicy(Toolkit::ScrollBar::FIXED); scrollBar.SetIndicatorFixedHeight(50.0f); // Render and notify @@ -833,7 +812,7 @@ int UtcDaliToolkitScrollBarSetIndicatorFixedHeightP(void) application.Render(); // Check that the indicator size should be 50.0f - DALI_TEST_EQUALS( indicator.GetCurrentSize().y, 50.0f, TEST_LOCATION ); + DALI_TEST_EQUALS( indicator.GetCurrentProperty< Vector3 >( Actor::Property::SIZE ).y, 50.0f, TEST_LOCATION ); // Set the indicator height to be fixed to 25.0f scrollBar.SetIndicatorFixedHeight(25.0f); @@ -843,7 +822,7 @@ int UtcDaliToolkitScrollBarSetIndicatorFixedHeightP(void) application.Render(); // Check that the indicator size should be 25.0f - DALI_TEST_EQUALS( indicator.GetCurrentSize().y, 25.0f, TEST_LOCATION ); + DALI_TEST_EQUALS( indicator.GetCurrentProperty< Vector3 >( Actor::Property::SIZE ).y, 25.0f, TEST_LOCATION ); END_TEST; } @@ -879,7 +858,7 @@ int UtcDaliToolkitScrollBarSetIndicatorShowDurationP(void) ScrollBar scrollBar = ScrollBar::New(); DALI_TEST_CHECK( scrollBar ); - Stage::GetCurrent().Add( scrollBar ); + application.GetScene().Add( scrollBar ); Actor indicator = scrollBar.GetScrollIndicator(); DALI_TEST_CHECK( indicator ); @@ -889,14 +868,14 @@ int UtcDaliToolkitScrollBarSetIndicatorShowDurationP(void) DALI_TEST_EQUALS( scrollBar.GetIndicatorShowDuration(), 0.35f, TEST_LOCATION ); // Make the indicator invisible - indicator.SetOpacity(0.0f); + indicator.SetProperty( Actor::Property::OPACITY,0.0f); // Render and notify application.SendNotification(); application.Render(); // Check that the indicator is invisible - DALI_TEST_EQUALS( indicator.GetCurrentOpacity(), 0.0f, TEST_LOCATION ); + DALI_TEST_EQUALS( indicator.GetCurrentProperty< float >( Actor::Property::OPACITY ), 0.0f, TEST_LOCATION ); // Show the indicator scrollBar.ShowIndicator(); @@ -909,21 +888,21 @@ int UtcDaliToolkitScrollBarSetIndicatorShowDurationP(void) application.Render(); // Check that the indicator is now visible - DALI_TEST_EQUALS( indicator.GetCurrentOpacity(), 1.0f, TEST_LOCATION ); + DALI_TEST_EQUALS( indicator.GetCurrentProperty< float >( Actor::Property::OPACITY ), 1.0f, TEST_LOCATION ); // Set the duration to show the indicator to be 0.75 second scrollBar.SetIndicatorShowDuration(0.75); DALI_TEST_EQUALS( scrollBar.GetIndicatorShowDuration(), 0.75f, TEST_LOCATION ); // Make the indicator invisible - indicator.SetOpacity(0.0f); + indicator.SetProperty( Actor::Property::OPACITY,0.0f); // Render and notify application.SendNotification(); application.Render(); // Check that the indicator is invisible - DALI_TEST_EQUALS( indicator.GetCurrentOpacity(), 0.0f, TEST_LOCATION ); + DALI_TEST_EQUALS( indicator.GetCurrentProperty< float >( Actor::Property::OPACITY ), 0.0f, TEST_LOCATION ); // Show the indicator scrollBar.ShowIndicator(); @@ -936,7 +915,7 @@ int UtcDaliToolkitScrollBarSetIndicatorShowDurationP(void) application.Render(); // Check that the indicator is not fully visible yet - DALI_TEST_CHECK( indicator.GetCurrentOpacity() != 1.0f ); + DALI_TEST_CHECK( indicator.GetCurrentProperty< float >( Actor::Property::OPACITY ) != 1.0f ); // Wait for another 0.4 second Wait(application, 400); @@ -946,7 +925,7 @@ int UtcDaliToolkitScrollBarSetIndicatorShowDurationP(void) application.Render(); // Check that the indicator is now fully visible - DALI_TEST_EQUALS( indicator.GetCurrentOpacity(), 1.0f, TEST_LOCATION ); + DALI_TEST_EQUALS( indicator.GetCurrentProperty< float >( Actor::Property::OPACITY ), 1.0f, TEST_LOCATION ); END_TEST; } @@ -959,7 +938,7 @@ int UtcDaliToolkitScrollBarSetIndicatorShowDurationN(void) ScrollBar scrollBar = ScrollBar::New(); DALI_TEST_CHECK( scrollBar ); - Stage::GetCurrent().Add( scrollBar ); + application.GetScene().Add( scrollBar ); Actor indicator = scrollBar.GetScrollIndicator(); DALI_TEST_CHECK( indicator ); @@ -971,14 +950,14 @@ int UtcDaliToolkitScrollBarSetIndicatorShowDurationN(void) DALI_TEST_CHECK( duration > 0.0f ); // Make the indicator invisible - indicator.SetOpacity(0.0f); + indicator.SetProperty( Actor::Property::OPACITY,0.0f); // Render and notify application.SendNotification(); application.Render(); // Check that the indicator is invisible - DALI_TEST_EQUALS( indicator.GetCurrentOpacity(), 0.0f, TEST_LOCATION ); + DALI_TEST_EQUALS( indicator.GetCurrentProperty< float >( Actor::Property::OPACITY ), 0.0f, TEST_LOCATION ); // Show the indicator scrollBar.ShowIndicator(); @@ -991,21 +970,21 @@ int UtcDaliToolkitScrollBarSetIndicatorShowDurationN(void) application.Render(); // Check that the indicator is now visible - DALI_TEST_EQUALS( indicator.GetCurrentOpacity(), 1.0f, TEST_LOCATION ); + DALI_TEST_EQUALS( indicator.GetCurrentProperty< float >( Actor::Property::OPACITY ), 1.0f, TEST_LOCATION ); // Now set the duration to show the indicator to be a negative value (which should be ignored and therefore means instant) scrollBar.SetIndicatorShowDuration(-0.25f); DALI_TEST_EQUALS( scrollBar.GetIndicatorShowDuration(), -0.25f, TEST_LOCATION ); // Make the indicator invisible - indicator.SetOpacity(0.0f); + indicator.SetProperty( Actor::Property::OPACITY,0.0f); // Render and notify application.SendNotification(); application.Render(); // Check that the indicator is invisible - DALI_TEST_EQUALS( indicator.GetCurrentOpacity(), 0.0f, TEST_LOCATION ); + DALI_TEST_EQUALS( indicator.GetCurrentProperty< float >( Actor::Property::OPACITY ), 0.0f, TEST_LOCATION ); // Show the indicator scrollBar.ShowIndicator(); @@ -1015,7 +994,7 @@ int UtcDaliToolkitScrollBarSetIndicatorShowDurationN(void) application.Render(); // Check that the indicator becomes instantly visible in the next frame - DALI_TEST_EQUALS( indicator.GetCurrentOpacity(), 1.0f, TEST_LOCATION ); + DALI_TEST_EQUALS( indicator.GetCurrentProperty< float >( Actor::Property::OPACITY ), 1.0f, TEST_LOCATION ); END_TEST; } @@ -1051,7 +1030,7 @@ int UtcDaliToolkitScrollBarSetIndicatorHideDurationP(void) ScrollBar scrollBar = ScrollBar::New(); DALI_TEST_CHECK( scrollBar ); - Stage::GetCurrent().Add( scrollBar ); + application.GetScene().Add( scrollBar ); Actor indicator = scrollBar.GetScrollIndicator(); DALI_TEST_CHECK( indicator ); @@ -1061,14 +1040,14 @@ int UtcDaliToolkitScrollBarSetIndicatorHideDurationP(void) DALI_TEST_EQUALS( scrollBar.GetIndicatorHideDuration(), 0.15f, TEST_LOCATION ); // Make the indicator visible - indicator.SetOpacity(1.0f); + indicator.SetProperty( Actor::Property::OPACITY,1.0f); // Render and notify application.SendNotification(); application.Render(); // Check that the indicator is visible - DALI_TEST_EQUALS( indicator.GetCurrentOpacity(), 1.0f, TEST_LOCATION ); + DALI_TEST_EQUALS( indicator.GetCurrentProperty< float >( Actor::Property::OPACITY ), 1.0f, TEST_LOCATION ); // Hide the indicator scrollBar.HideIndicator(); @@ -1081,21 +1060,21 @@ int UtcDaliToolkitScrollBarSetIndicatorHideDurationP(void) application.Render(); // Check that the indicator is now invisible - DALI_TEST_EQUALS( indicator.GetCurrentOpacity(), 0.0f, TEST_LOCATION ); + DALI_TEST_EQUALS( indicator.GetCurrentProperty< float >( Actor::Property::OPACITY ), 0.0f, TEST_LOCATION ); // Set the duration to hide the indicator to be 0.65 second scrollBar.SetIndicatorHideDuration(0.65f); DALI_TEST_EQUALS( scrollBar.GetIndicatorHideDuration(), 0.65f, TEST_LOCATION ); // Make the indicator visible - indicator.SetOpacity(1.0f); + indicator.SetProperty( Actor::Property::OPACITY,1.0f); // Render and notify application.SendNotification(); application.Render(); // Check that the indicator is visible - DALI_TEST_EQUALS( indicator.GetCurrentOpacity(), 1.0f, TEST_LOCATION ); + DALI_TEST_EQUALS( indicator.GetCurrentProperty< float >( Actor::Property::OPACITY ), 1.0f, TEST_LOCATION ); // Hide the indicator scrollBar.HideIndicator(); @@ -1108,7 +1087,7 @@ int UtcDaliToolkitScrollBarSetIndicatorHideDurationP(void) application.Render(); // Check that the indicator is not fully invisible yet - DALI_TEST_CHECK( indicator.GetCurrentOpacity() != 0.0f ); + DALI_TEST_CHECK( indicator.GetCurrentProperty< float >( Actor::Property::OPACITY ) != 0.0f ); // Wait for another 0.5 second Wait(application, 500); @@ -1118,7 +1097,7 @@ int UtcDaliToolkitScrollBarSetIndicatorHideDurationP(void) application.Render(); // Check that the indicator is now fully invisible - DALI_TEST_EQUALS( indicator.GetCurrentOpacity(), 0.0f, TEST_LOCATION ); + DALI_TEST_EQUALS( indicator.GetCurrentProperty< float >( Actor::Property::OPACITY ), 0.0f, TEST_LOCATION ); END_TEST; } @@ -1131,7 +1110,7 @@ int UtcDaliToolkitScrollBarSetIndicatorHideDurationN(void) ScrollBar scrollBar = ScrollBar::New(); DALI_TEST_CHECK( scrollBar ); - Stage::GetCurrent().Add( scrollBar ); + application.GetScene().Add( scrollBar ); Actor indicator = scrollBar.GetScrollIndicator(); DALI_TEST_CHECK( indicator ); @@ -1143,14 +1122,14 @@ int UtcDaliToolkitScrollBarSetIndicatorHideDurationN(void) DALI_TEST_CHECK( duration > 0.0f ); // Make the indicator visible - indicator.SetOpacity(1.0f); + indicator.SetProperty( Actor::Property::OPACITY,1.0f); // Render and notify application.SendNotification(); application.Render(); // Check that the indicator is visible - DALI_TEST_EQUALS( indicator.GetCurrentOpacity(), 1.0f, TEST_LOCATION ); + DALI_TEST_EQUALS( indicator.GetCurrentProperty< float >( Actor::Property::OPACITY ), 1.0f, TEST_LOCATION ); // Hide the indicator scrollBar.HideIndicator(); @@ -1163,21 +1142,21 @@ int UtcDaliToolkitScrollBarSetIndicatorHideDurationN(void) application.Render(); // Check that the indicator is now invisible - DALI_TEST_EQUALS( indicator.GetCurrentOpacity(), 0.0f, TEST_LOCATION ); + DALI_TEST_EQUALS( indicator.GetCurrentProperty< float >( Actor::Property::OPACITY ), 0.0f, TEST_LOCATION ); // Now set the duration to hide the indicator to be a negative value (which should be ignored and therefore means instant) scrollBar.SetIndicatorHideDuration(-0.25f); DALI_TEST_EQUALS( scrollBar.GetIndicatorHideDuration(), -0.25f, TEST_LOCATION ); // Make the indicator visible - indicator.SetOpacity(1.0f); + indicator.SetProperty( Actor::Property::OPACITY,1.0f); // Render and notify application.SendNotification(); application.Render(); // Check that the indicator is visible - DALI_TEST_EQUALS( indicator.GetCurrentOpacity(), 1.0f, TEST_LOCATION ); + DALI_TEST_EQUALS( indicator.GetCurrentProperty< float >( Actor::Property::OPACITY ), 1.0f, TEST_LOCATION ); // Hide the indicator scrollBar.HideIndicator(); @@ -1187,7 +1166,7 @@ int UtcDaliToolkitScrollBarSetIndicatorHideDurationN(void) application.Render(); // Check that the indicator becomes instantly invisible in the next frame - DALI_TEST_EQUALS( indicator.GetCurrentOpacity(), 0.0f, TEST_LOCATION ); + DALI_TEST_EQUALS( indicator.GetCurrentProperty< float >( Actor::Property::OPACITY ), 0.0f, TEST_LOCATION ); END_TEST; } @@ -1223,7 +1202,7 @@ int UtcDaliToolkitScrollBarShowIndicatorP(void) ScrollBar scrollBar = ScrollBar::New(); DALI_TEST_CHECK( scrollBar ); - Stage::GetCurrent().Add( scrollBar ); + application.GetScene().Add( scrollBar ); Actor indicator = scrollBar.GetScrollIndicator(); DALI_TEST_CHECK( indicator ); @@ -1235,14 +1214,14 @@ int UtcDaliToolkitScrollBarShowIndicatorP(void) DALI_TEST_CHECK( duration > 0.0f ); // Make the indicator invisible - indicator.SetOpacity(0.0f); + indicator.SetProperty( Actor::Property::OPACITY,0.0f); // Render and notify application.SendNotification(); application.Render(); // Check that the indicator is invisible - DALI_TEST_EQUALS( indicator.GetCurrentOpacity(), 0.0f, TEST_LOCATION ); + DALI_TEST_EQUALS( indicator.GetCurrentProperty< float >( Actor::Property::OPACITY ), 0.0f, TEST_LOCATION ); // Show the indicator scrollBar.ShowIndicator(); @@ -1255,7 +1234,7 @@ int UtcDaliToolkitScrollBarShowIndicatorP(void) application.Render(); // Check that the indicator is now visible - DALI_TEST_EQUALS( indicator.GetCurrentOpacity(), 1.0f, TEST_LOCATION ); + DALI_TEST_EQUALS( indicator.GetCurrentProperty< float >( Actor::Property::OPACITY ), 1.0f, TEST_LOCATION ); END_TEST; } @@ -1268,20 +1247,20 @@ int UtcDaliToolkitScrollBarShowIndicatorN(void) ScrollBar scrollBar = ScrollBar::New(); DALI_TEST_CHECK( scrollBar ); - Stage::GetCurrent().Add( scrollBar ); + application.GetScene().Add( scrollBar ); Actor indicator = scrollBar.GetScrollIndicator(); DALI_TEST_CHECK( indicator ); // Make the indicator initially visible - indicator.SetOpacity(1.0f); + indicator.SetProperty( Actor::Property::OPACITY,1.0f); // Render and notify application.SendNotification(); application.Render(); // Check that the indicator is initially visible - DALI_TEST_EQUALS( indicator.GetCurrentOpacity(), 1.0f, TEST_LOCATION ); + DALI_TEST_EQUALS( indicator.GetCurrentProperty< float >( Actor::Property::OPACITY ), 1.0f, TEST_LOCATION ); // Get the default duration to show the indicator float duration = scrollBar.GetIndicatorShowDuration(); @@ -1297,7 +1276,7 @@ int UtcDaliToolkitScrollBarShowIndicatorN(void) application.Render(); // Check that the indicator is still visible in the very next frame - DALI_TEST_EQUALS( indicator.GetCurrentOpacity(), 1.0f, TEST_LOCATION ); + DALI_TEST_EQUALS( indicator.GetCurrentProperty< float >( Actor::Property::OPACITY ), 1.0f, TEST_LOCATION ); END_TEST; } @@ -1310,7 +1289,7 @@ int UtcDaliToolkitScrollBarHideIndicatorP(void) ScrollBar scrollBar = ScrollBar::New(); DALI_TEST_CHECK( scrollBar ); - Stage::GetCurrent().Add( scrollBar ); + application.GetScene().Add( scrollBar ); Actor indicator = scrollBar.GetScrollIndicator(); DALI_TEST_CHECK( indicator ); @@ -1322,14 +1301,14 @@ int UtcDaliToolkitScrollBarHideIndicatorP(void) DALI_TEST_CHECK( duration > 0.0f ); // Make the indicator visible - indicator.SetOpacity(1.0f); + indicator.SetProperty( Actor::Property::OPACITY,1.0f); // Render and notify application.SendNotification(); application.Render(); // Check that the indicator is visible - DALI_TEST_EQUALS( indicator.GetCurrentOpacity(), 1.0f, TEST_LOCATION ); + DALI_TEST_EQUALS( indicator.GetCurrentProperty< float >( Actor::Property::OPACITY ), 1.0f, TEST_LOCATION ); // Hide the indicator scrollBar.HideIndicator(); @@ -1342,7 +1321,7 @@ int UtcDaliToolkitScrollBarHideIndicatorP(void) application.Render(); // Check that the indicator is now invisible - DALI_TEST_EQUALS( indicator.GetCurrentOpacity(), 0.0f, TEST_LOCATION ); + DALI_TEST_EQUALS( indicator.GetCurrentProperty< float >( Actor::Property::OPACITY ), 0.0f, TEST_LOCATION ); END_TEST; } @@ -1355,20 +1334,20 @@ int UtcDaliToolkitScrollBarHideIndicatorN(void) ScrollBar scrollBar = ScrollBar::New(); DALI_TEST_CHECK( scrollBar ); - Stage::GetCurrent().Add( scrollBar ); + application.GetScene().Add( scrollBar ); Actor indicator = scrollBar.GetScrollIndicator(); DALI_TEST_CHECK( indicator ); // Make the indicator initially invisible - indicator.SetOpacity(0.0f); + indicator.SetProperty( Actor::Property::OPACITY,0.0f); // Render and notify application.SendNotification(); application.Render(); // Check that the indicator is initially invisible - DALI_TEST_EQUALS( indicator.GetCurrentOpacity(), 0.0f, TEST_LOCATION ); + DALI_TEST_EQUALS( indicator.GetCurrentProperty< float >( Actor::Property::OPACITY ), 0.0f, TEST_LOCATION ); // Get the default duration to hide the indicator float duration = scrollBar.GetIndicatorHideDuration(); @@ -1384,7 +1363,7 @@ int UtcDaliToolkitScrollBarHideIndicatorN(void) application.Render(); // Check that the indicator is still invisible in the very next frame - DALI_TEST_EQUALS( indicator.GetCurrentOpacity(), 0.0f, TEST_LOCATION ); + DALI_TEST_EQUALS( indicator.GetCurrentProperty< float >( Actor::Property::OPACITY ), 0.0f, TEST_LOCATION ); END_TEST; } @@ -1397,7 +1376,7 @@ int UtcDaliToolkitScrollBarActionShowIndicator(void) ScrollBar scrollBar = ScrollBar::New(); DALI_TEST_CHECK( scrollBar ); - Stage::GetCurrent().Add( scrollBar ); + application.GetScene().Add( scrollBar ); Actor indicator = scrollBar.GetScrollIndicator(); DALI_TEST_CHECK( indicator ); @@ -1409,14 +1388,14 @@ int UtcDaliToolkitScrollBarActionShowIndicator(void) DALI_TEST_CHECK( duration > 0.0f ); // Make the indicator invisible - indicator.SetOpacity(0.0f); + indicator.SetProperty( Actor::Property::OPACITY,0.0f); // Render and notify application.SendNotification(); application.Render(); // Check that the indicator is invisible - DALI_TEST_EQUALS( indicator.GetCurrentOpacity(), 0.0f, TEST_LOCATION ); + DALI_TEST_EQUALS( indicator.GetCurrentProperty< float >( Actor::Property::OPACITY ), 0.0f, TEST_LOCATION ); // Do the "ShowIndicator" action Property::Map emptyMap; @@ -1430,7 +1409,7 @@ int UtcDaliToolkitScrollBarActionShowIndicator(void) application.Render(); // Check that the indicator is now visible - DALI_TEST_EQUALS( indicator.GetCurrentOpacity(), 1.0f, TEST_LOCATION ); + DALI_TEST_EQUALS( indicator.GetCurrentProperty< float >( Actor::Property::OPACITY ), 1.0f, TEST_LOCATION ); END_TEST; } @@ -1443,7 +1422,7 @@ int UtcDaliToolkitScrollBarActionHideIndicator(void) ScrollBar scrollBar = ScrollBar::New(); DALI_TEST_CHECK( scrollBar ); - Stage::GetCurrent().Add( scrollBar ); + application.GetScene().Add( scrollBar ); Actor indicator = scrollBar.GetScrollIndicator(); DALI_TEST_CHECK( indicator ); @@ -1455,14 +1434,14 @@ int UtcDaliToolkitScrollBarActionHideIndicator(void) DALI_TEST_CHECK( duration > 0.0f ); // Make the indicator visible - indicator.SetOpacity(1.0f); + indicator.SetProperty( Actor::Property::OPACITY,1.0f); // Render and notify application.SendNotification(); application.Render(); // Check that the indicator is visible - DALI_TEST_EQUALS( indicator.GetCurrentOpacity(), 1.0f, TEST_LOCATION ); + DALI_TEST_EQUALS( indicator.GetCurrentProperty< float >( Actor::Property::OPACITY ), 1.0f, TEST_LOCATION ); // Do the "HideIndicator" action Property::Map emptyMap; @@ -1476,7 +1455,7 @@ int UtcDaliToolkitScrollBarActionHideIndicator(void) application.Render(); // Check that the indicator is now invisible - DALI_TEST_EQUALS( indicator.GetCurrentOpacity(), 0.0f, TEST_LOCATION ); + DALI_TEST_EQUALS( indicator.GetCurrentProperty< float >( Actor::Property::OPACITY ), 0.0f, TEST_LOCATION ); END_TEST; } @@ -1489,7 +1468,7 @@ int UtcDaliToolkitScrollBarActionShowTransientIndicator(void) ScrollBar scrollBar = ScrollBar::New(); DALI_TEST_CHECK( scrollBar ); - Stage::GetCurrent().Add( scrollBar ); + application.GetScene().Add( scrollBar ); Actor indicator = scrollBar.GetScrollIndicator(); DALI_TEST_CHECK( indicator ); @@ -1501,14 +1480,14 @@ int UtcDaliToolkitScrollBarActionShowTransientIndicator(void) DALI_TEST_CHECK( duration > 0.0f ); // Make the indicator invisible - indicator.SetOpacity(0.0f); + indicator.SetProperty( Actor::Property::OPACITY,0.0f); // Render and notify application.SendNotification(); application.Render(); // Check that the indicator is invisible - DALI_TEST_EQUALS( indicator.GetCurrentOpacity(), 0.0f, TEST_LOCATION ); + DALI_TEST_EQUALS( indicator.GetCurrentProperty< float >( Actor::Property::OPACITY ), 0.0f, TEST_LOCATION ); // Do the "ShowIndicator" action Property::Map emptyMap; @@ -1522,11 +1501,11 @@ int UtcDaliToolkitScrollBarActionShowTransientIndicator(void) application.Render(); // Check that the indicator is now visible - DALI_TEST_EQUALS( indicator.GetCurrentOpacity(), 1.0f, TEST_LOCATION ); + DALI_TEST_EQUALS( indicator.GetCurrentProperty< float >( Actor::Property::OPACITY ), 1.0f, TEST_LOCATION ); // Get the default duration to hide the indicator float hideDuration = scrollBar.GetProperty( ScrollBar::Property::INDICATOR_HIDE_DURATION ); - float transientDuration = scrollBar.GetProperty( DevelScrollBar::Property::INDICATOR_TRANSIENT_DURATION ); + float transientDuration = scrollBar.GetProperty( ScrollBar::Property::INDICATOR_TRANSIENT_DURATION ); float totalVisibleDuration = hideDuration + transientDuration; // Check that the default duration is greater than 0 @@ -1540,7 +1519,7 @@ int UtcDaliToolkitScrollBarActionShowTransientIndicator(void) application.Render(); // Check that the indicator is now invisible - DALI_TEST_EQUALS( indicator.GetCurrentOpacity(), 0.0f, TEST_LOCATION ); + DALI_TEST_EQUALS( indicator.GetCurrentProperty< float >( Actor::Property::OPACITY ), 0.0f, TEST_LOCATION ); END_TEST; } @@ -1553,13 +1532,13 @@ int UtcDaliToolkitScrollBarActionShowTransientIndicatorImmediate(void) ScrollBar scrollBar = ScrollBar::New(); DALI_TEST_CHECK( scrollBar ); - Stage::GetCurrent().Add( scrollBar ); + application.GetScene().Add( scrollBar ); Actor indicator = scrollBar.GetScrollIndicator(); DALI_TEST_CHECK( indicator ); // Make the indicator invisible - indicator.SetOpacity(0.0f); + indicator.SetProperty( Actor::Property::OPACITY,0.0f); // Don't use a show animation; the indicator should appear immediately scrollBar.SetProperty( ScrollBar::Property::INDICATOR_SHOW_DURATION, 0.0f ); @@ -1582,11 +1561,11 @@ int UtcDaliToolkitScrollBarActionShowTransientIndicatorImmediate(void) application.Render(); // Check that the indicator is now visible - DALI_TEST_EQUALS( indicator.GetCurrentOpacity(), 1.0f, TEST_LOCATION ); + DALI_TEST_EQUALS( indicator.GetCurrentProperty< float >( Actor::Property::OPACITY ), 1.0f, TEST_LOCATION ); // Get the default duration to hide the indicator float hideDuration = scrollBar.GetProperty( ScrollBar::Property::INDICATOR_HIDE_DURATION ); - float transientDuration = scrollBar.GetProperty( DevelScrollBar::Property::INDICATOR_TRANSIENT_DURATION ); + float transientDuration = scrollBar.GetProperty( ScrollBar::Property::INDICATOR_TRANSIENT_DURATION ); float totalVisibleDuration = hideDuration + transientDuration; // Check that the default duration is greater than 0 @@ -1600,7 +1579,7 @@ int UtcDaliToolkitScrollBarActionShowTransientIndicatorImmediate(void) application.Render(); // Check that the indicator is now invisible - DALI_TEST_EQUALS( indicator.GetCurrentOpacity(), 0.0f, TEST_LOCATION ); + DALI_TEST_EQUALS( indicator.GetCurrentProperty< float >( Actor::Property::OPACITY ), 0.0f, TEST_LOCATION ); END_TEST; } @@ -1613,7 +1592,7 @@ int UtcDaliToolkitScrollBarActionShowTransientIndicatorDuringHide(void) ScrollBar scrollBar = ScrollBar::New(); DALI_TEST_CHECK( scrollBar ); - Stage::GetCurrent().Add( scrollBar ); + application.GetScene().Add( scrollBar ); Actor indicator = scrollBar.GetScrollIndicator(); DALI_TEST_CHECK( indicator ); @@ -1625,14 +1604,14 @@ int UtcDaliToolkitScrollBarActionShowTransientIndicatorDuringHide(void) DALI_TEST_CHECK( duration > 0.0f ); // Make the indicator visible - indicator.SetOpacity(1.0f); + indicator.SetProperty( Actor::Property::OPACITY,1.0f); // Render and notify application.SendNotification(); application.Render(); // Check that the indicator is visible - DALI_TEST_EQUALS( indicator.GetCurrentOpacity(), 1.0f, TEST_LOCATION ); + DALI_TEST_EQUALS( indicator.GetCurrentProperty< float >( Actor::Property::OPACITY ), 1.0f, TEST_LOCATION ); // Hide the indicator scrollBar.HideIndicator(); @@ -1645,7 +1624,7 @@ int UtcDaliToolkitScrollBarActionShowTransientIndicatorDuringHide(void) application.Render(); // Check that the indicator is now partially hidden - DALI_TEST_CHECK( indicator.GetCurrentOpacity() < 1.0f ); + DALI_TEST_CHECK( indicator.GetCurrentProperty< float >( Actor::Property::OPACITY ) < 1.0f ); // Now interrupt the Hide with a DoAction( "ShowTransientIndicator" ) @@ -1667,11 +1646,11 @@ int UtcDaliToolkitScrollBarActionShowTransientIndicatorDuringHide(void) application.Render(); // Check that the indicator is now visible - DALI_TEST_EQUALS( indicator.GetCurrentOpacity(), 1.0f, TEST_LOCATION ); + DALI_TEST_EQUALS( indicator.GetCurrentProperty< float >( Actor::Property::OPACITY ), 1.0f, TEST_LOCATION ); // Get the default duration to hide the indicator float hideDuration = scrollBar.GetProperty( ScrollBar::Property::INDICATOR_HIDE_DURATION ); - float transientDuration = scrollBar.GetProperty( DevelScrollBar::Property::INDICATOR_TRANSIENT_DURATION ); + float transientDuration = scrollBar.GetProperty( ScrollBar::Property::INDICATOR_TRANSIENT_DURATION ); float totalVisibleDuration = hideDuration + transientDuration; // Check that the default duration is greater than 0 @@ -1685,7 +1664,7 @@ int UtcDaliToolkitScrollBarActionShowTransientIndicatorDuringHide(void) application.Render(); // Check that the indicator is now invisible - DALI_TEST_EQUALS( indicator.GetCurrentOpacity(), 0.0f, TEST_LOCATION ); + DALI_TEST_EQUALS( indicator.GetCurrentProperty< float >( Actor::Property::OPACITY ), 0.0f, TEST_LOCATION ); END_TEST; } @@ -1695,18 +1674,18 @@ int UtcDaliToolkitScrollBarPanFinishedSignalP(void) ToolkitTestApplication application; // Create a vertical scroll bar - ScrollBar scrollBar = ScrollBar::New(ScrollBar::Vertical); + ScrollBar scrollBar = ScrollBar::New(ScrollBar::VERTICAL); DALI_TEST_CHECK( scrollBar ); - scrollBar.SetParentOrigin(ParentOrigin::TOP_LEFT); - scrollBar.SetAnchorPoint(AnchorPoint::TOP_LEFT); - scrollBar.SetSize(20.0f, 800.0f, 0.0f); + scrollBar.SetProperty( Actor::Property::PARENT_ORIGIN,ParentOrigin::TOP_LEFT); + scrollBar.SetProperty( Actor::Property::ANCHOR_POINT,AnchorPoint::TOP_LEFT); + scrollBar.SetProperty( Actor::Property::SIZE, Vector3(20.0f, 800.0f, 0.0f) ); // Set the indicator height to be fixed to 50.0f - scrollBar.SetIndicatorHeightPolicy(Toolkit::ScrollBar::Fixed); + scrollBar.SetIndicatorHeightPolicy(Toolkit::ScrollBar::FIXED); scrollBar.SetIndicatorFixedHeight(50.0f); - Stage::GetCurrent().Add( scrollBar ); + application.GetScene().Add( scrollBar ); // Connect the pan finished signal ConnectionTracker connectionTracker; @@ -1720,7 +1699,7 @@ int UtcDaliToolkitScrollBarPanFinishedSignalP(void) // Create a source actor that owns the scroll properties required by the scroll bar Actor sourceActor = Actor::New(); - Stage::GetCurrent().Add( sourceActor ); + application.GetScene().Add( sourceActor ); // Register the scroll properties Property::Index propertyScrollPosition = sourceActor.RegisterProperty( "sourcePosition", 0.0f ); @@ -1741,7 +1720,7 @@ int UtcDaliToolkitScrollBarPanFinishedSignalP(void) application.Render(); // Perform a swipe gesture on the indicator - PerformGestureSwipe(application, Vector2(1.0f, 1.0f), Vector2(Vector2::YAXIS * 1.0f), 20); + PerformGestureSwipe(application, Vector2(1.0f, 1.0f), Vector2(Vector2::YAXIS * 1.0f), 1, 500); DALI_TEST_EQUALS( gOnPanFinishedCalled, true, TEST_LOCATION ); DALI_TEST_EQUALS( panFinished, true, TEST_LOCATION ); @@ -1753,18 +1732,18 @@ int UtcDaliToolkitScrollBarPanFinishedSignalN(void) ToolkitTestApplication application; // Create a vertical scroll bar - ScrollBar scrollBar = ScrollBar::New(ScrollBar::Vertical); + ScrollBar scrollBar = ScrollBar::New(ScrollBar::VERTICAL); DALI_TEST_CHECK( scrollBar ); - scrollBar.SetParentOrigin(ParentOrigin::TOP_LEFT); - scrollBar.SetAnchorPoint(AnchorPoint::TOP_LEFT); - scrollBar.SetSize(20.0f, 800.0f, 0.0f); + scrollBar.SetProperty( Actor::Property::PARENT_ORIGIN,ParentOrigin::TOP_LEFT); + scrollBar.SetProperty( Actor::Property::ANCHOR_POINT,AnchorPoint::TOP_LEFT); + scrollBar.SetProperty( Actor::Property::SIZE, Vector3(20.0f, 800.0f, 0.0f) ); // Set the indicator height to be fixed to 50.0f - scrollBar.SetIndicatorHeightPolicy(Toolkit::ScrollBar::Fixed); + scrollBar.SetIndicatorHeightPolicy(Toolkit::ScrollBar::FIXED); scrollBar.SetIndicatorFixedHeight(50.0f); - Stage::GetCurrent().Add( scrollBar ); + application.GetScene().Add( scrollBar ); // Connect the pan finished signal ConnectionTracker connectionTracker; @@ -1777,12 +1756,12 @@ int UtcDaliToolkitScrollBarPanFinishedSignalN(void) application.Render(); // Perform a vertical swipe gesture on the indicator when there is no source object set on the scroll bar - PerformGestureSwipe(application, Vector2(1.0f, 1.0f), Vector2(Vector2::YAXIS * 1.0f), 20); + PerformGestureSwipe(application, Vector2(1.0f, 1.0f), Vector2(Vector2::YAXIS * 1.0f), 20, 500); DALI_TEST_EQUALS( gOnPanFinishedCalled, false, TEST_LOCATION ); // Create a source actor that owns the scroll properties required by the scroll bar Actor sourceActor = Actor::New(); - Stage::GetCurrent().Add( sourceActor ); + application.GetScene().Add( sourceActor ); // Register the scroll properties Property::Index propertyScrollPosition = sourceActor.RegisterProperty( "sourcePosition", 0.0f ); @@ -1803,12 +1782,12 @@ int UtcDaliToolkitScrollBarPanFinishedSignalN(void) application.Render(); // Perform a swipe gesture on the scroll bar but not on the indicator - PerformGestureSwipe(application, Vector2(1.0f, 780.0f), Vector2(Vector2::YAXIS * -1.0f), 20); + PerformGestureSwipe(application, Vector2(1.0f, 780.0f), Vector2(Vector2::YAXIS * -1.0f), 20, 2000); DALI_TEST_EQUALS( gOnPanFinishedCalled, false, TEST_LOCATION ); DALI_TEST_EQUALS( panFinished, false, TEST_LOCATION ); // Perform a swipe gesture on the indicator - PerformGestureSwipe(application, Vector2(1.0f, 1.0f), Vector2(Vector2::YAXIS * 1.0f), 20); + PerformGestureSwipe(application, Vector2(1.0f, 1.0f), Vector2(Vector2::YAXIS * 1.0f), 20, 4000); DALI_TEST_EQUALS( gOnPanFinishedCalled, true, TEST_LOCATION ); DALI_TEST_EQUALS( panFinished, true, TEST_LOCATION ); @@ -1820,14 +1799,14 @@ int UtcDaliToolkitScrollBarScrollPositionIntervalReachedSignalP(void) ToolkitTestApplication application; // Create a vertical scroll bar - ScrollBar scrollBar = ScrollBar::New(ScrollBar::Vertical); + ScrollBar scrollBar = ScrollBar::New(ScrollBar::VERTICAL); DALI_TEST_CHECK( scrollBar ); - scrollBar.SetParentOrigin(ParentOrigin::TOP_LEFT); - scrollBar.SetAnchorPoint(AnchorPoint::TOP_LEFT); - scrollBar.SetSize(20.0f, 800.0f, 0.0f); + scrollBar.SetProperty( Actor::Property::PARENT_ORIGIN,ParentOrigin::TOP_LEFT); + scrollBar.SetProperty( Actor::Property::ANCHOR_POINT,AnchorPoint::TOP_LEFT); + scrollBar.SetProperty( Actor::Property::SIZE, Vector3(20.0f, 800.0f, 0.0f) ); - Stage::GetCurrent().Add( scrollBar ); + application.GetScene().Add( scrollBar ); ConnectionTracker connectionTracker; // Connect to the ScrollPositionIntervalReached signal @@ -1841,7 +1820,7 @@ int UtcDaliToolkitScrollBarScrollPositionIntervalReachedSignalP(void) // Create a source actor that owns the scroll properties required by the scroll bar Actor sourceActor = Actor::New(); - Stage::GetCurrent().Add( sourceActor ); + application.GetScene().Add( sourceActor ); // Register the scroll properties Property::Index propertyScrollPosition = sourceActor.RegisterProperty( "sourcePosition", 0.0f ); @@ -1936,14 +1915,14 @@ int UtcDaliToolkitScrollBarScrollPositionIntervalReachedSignalN(void) ToolkitTestApplication application; // Create a vertical scroll bar - ScrollBar scrollBar = ScrollBar::New(ScrollBar::Vertical); + ScrollBar scrollBar = ScrollBar::New(ScrollBar::VERTICAL); DALI_TEST_CHECK( scrollBar ); - scrollBar.SetParentOrigin(ParentOrigin::TOP_LEFT); - scrollBar.SetAnchorPoint(AnchorPoint::TOP_LEFT); - scrollBar.SetSize(20.0f, 800.0f, 0.0f); + scrollBar.SetProperty( Actor::Property::PARENT_ORIGIN,ParentOrigin::TOP_LEFT); + scrollBar.SetProperty( Actor::Property::ANCHOR_POINT,AnchorPoint::TOP_LEFT); + scrollBar.SetProperty( Actor::Property::SIZE, Vector3(20.0f, 800.0f, 0.0f) ); - Stage::GetCurrent().Add( scrollBar ); + application.GetScene().Add( scrollBar ); // Connect to the ScrollPositionIntervalReached signal scrollBar.ScrollPositionIntervalReachedSignal().Connect( &OnScrollPositionIntervalReached ); @@ -1954,7 +1933,7 @@ int UtcDaliToolkitScrollBarScrollPositionIntervalReachedSignalN(void) // Create a source actor that owns the scroll properties required by the scroll bar Actor sourceActor = Actor::New(); - Stage::GetCurrent().Add( sourceActor ); + application.GetScene().Add( sourceActor ); // Register the scroll properties Property::Index propertyScrollPosition = sourceActor.RegisterProperty( "sourcePosition", 0.0f );