--- a/videoplayback/videoplaybackview/tsrc/testprogressbar/src/testprogressbar.cpp Thu Sep 02 20:28:16 2010 +0300
+++ b/videoplayback/videoplaybackview/tsrc/testprogressbar/src/testprogressbar.cpp Fri Sep 17 08:30:05 2010 +0300
@@ -15,7 +15,7 @@
*
*/
-// Version : %version: 10 %
+// Version : %version: 11 %
#include <qdebug>
@@ -214,31 +214,6 @@
QVERIFY( mProgBar->mProgressSlider->progressValue() == movedPositoin );
QVERIFY( mProgBar->mProgressSlider->sliderValue() == movedPositoin );
- //
- // If user isnot dragging the slider and movedPosition > mDuration
- //
- movedPositoin = 30;
- mProgBar->mSliderDragging = false;
-
- emit mProgBar->mProgressSlider->move( movedPositoin );
-
- QVERIFY( mProgBar->mProgressSlider->progressValue() == mProgBar->mDuration );
- QVERIFY( mProgBar->mProgressSlider->sliderValue() == mProgBar->mDuration );
- QVERIFY( mController->mCommand == EMPXPbvCmdEndOfClip );
-
- //
- // If user isnot dragging the slider and movedPosition < mDuration
- //
- movedPositoin = 10;
-
- emit mProgBar->mProgressSlider->move( movedPositoin );
-
- QVERIFY( mProgBar->mProgressSlider->progressValue() == movedPositoin );
- QVERIFY( mProgBar->mProgressSlider->sliderValue() == movedPositoin );
-
- QVERIFY( mController->mCommand == EMPXPbvCmdSetPosition );
- QVERIFY( mController->mValue == movedPositoin );
-
cleanup();
}
@@ -450,4 +425,31 @@
cleanup();
}
+// -------------------------------------------------------------------------------------------------
+// testResetControl
+// -------------------------------------------------------------------------------------------------
+//
+void TestProgressBar::testResetControl()
+{
+ MPX_ENTER_EXIT(_L("TestProgressBar::testResetControl()"));
+
+ setup();
+
+ mController->mTimerAction = ETimerCancel;
+ mProgBar->mSliderDragging = true;
+ mProgBar->resetControl();
+
+ QVERIFY( ! mProgBar->mSliderDragging );
+ QVERIFY( mController->mTimerAction == ETimerReset );
+
+ mController->mTimerAction = ETimerCancel;
+ mProgBar->mSliderDragging = false;
+ mProgBar->resetControl();
+
+ QVERIFY( ! mProgBar->mSliderDragging );
+ QVERIFY( mController->mTimerAction == ETimerCancel );
+
+ cleanup();
+}
+
// End of file