X-Git-Url: http://review.tizen.org/git/?a=blobdiff_plain;f=automated-tests%2Fsrc%2Fdali-toolkit%2Futc-Dali-ScrollViewEffect.cpp;h=553dc7aae2903dd942f408e3651e7f2c30353cae;hb=be0d47169c97f0a3100834d0c129032bdefce9c6;hp=fdd75ecfe001ac58c771c816cd5291818b603546;hpb=d5e3ed5f5b1c8fdba3ae97ead8729620f54b3836;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 fdd75ec..553dc7a 100644 --- a/automated-tests/src/dali-toolkit/utc-Dali-ScrollViewEffect.cpp +++ b/automated-tests/src/dali-toolkit/utc-Dali-ScrollViewEffect.cpp @@ -42,12 +42,6 @@ void utc_dali_toolkit_scroll_view_effect_cleanup(void) namespace { -static bool gObjectCreatedCallBackCalled; - -static void TestCallback(BaseHandle handle) -{ - gObjectCreatedCallBackCalled = true; -} const int MILLISECONDS_PER_SECOND = 1000; const int RENDER_FRAME_INTERVAL = 16; ///< Duration of each frame in ms. (at approx 60FPS) @@ -100,10 +94,6 @@ RulerPtr CreateRuler(float gridSize = 0.0f) static bool gOnScrollStartCalled; ///< Whether the OnScrollStart signal was invoked. static bool gOnScrollUpdateCalled; ///< Whether the OnScrollUpdate signal was invoked. static bool gOnScrollCompleteCalled; ///< Whether the OnScrollComplete signal was invoked. -static bool gOnScrollClampedCalled; ///< Whether the OnScrollClamped signal was invoked. -static bool gOnSnapStartCalled; ///< Whether the OnSnapStart signal was invoked. -static ClampState3 gLastClampPosition; ///< Clamping information from OnScrollClampedEvent. -static SnapType gLastSnapType; ///< Snaping information from SnapEvent. static Vector3 gConstraintResult; ///< Result from constraint. static ActorContainer gPages; ///< Keeps track of all the pages for applying effects. @@ -145,28 +135,6 @@ static void OnScrollComplete( const Vector3& position ) gOnScrollCompleteCalled = true; } -/** - * Invoked when scrolling clamped. - * - * @param[in] event The position/scale/rotation axes that were clamped. - */ -static void OnScrollClamped( const ScrollView::ClampEvent& event ) -{ - gOnScrollClampedCalled = true; - gLastClampPosition = event.position; -} - -/** - * Invoked when a snap or flick started. - * - * @param[in] event The type of snap and the target position/scale/rotation. - */ -static void OnSnapStart( const ScrollView::SnapEvent& event ) -{ - gOnSnapStartCalled = true; - gLastSnapType = event.type; -} - ScrollView SetupTestScrollView(int rows, int columns, Vector2 size) { ScrollView scrollView = ScrollView::New(); @@ -174,9 +142,7 @@ ScrollView SetupTestScrollView(int rows, int columns, Vector2 size) scrollView.SetAnchorPoint(AnchorPoint::CENTER); scrollView.SetParentOrigin(ParentOrigin::CENTER); scrollView.ApplyConstraint( Constraint::New( Dali::Actor::SIZE, Dali::ParentSource( Dali::Actor::SIZE ), Dali::EqualToConstraint() ) ); - // Disable Refresh signal (TET environment cannot use adaptor's Timer) scrollView.SetWrapMode(false); - scrollView.SetRefreshInterval(0); scrollView.ScrollStartedSignal().Connect( &OnScrollStart ); scrollView.ScrollUpdatedSignal().Connect( &OnScrollUpdate ); scrollView.ScrollCompletedSignal().Connect( &OnScrollComplete );