diff -r 4707a0db12f6 -r adb51f74b890 videoplayback/videoplaybackview/tsrc/testcontrolscontroller/src/testcontrolscontroller.cpp --- a/videoplayback/videoplaybackview/tsrc/testcontrolscontroller/src/testcontrolscontroller.cpp Mon Sep 20 18:25:37 2010 +0300 +++ b/videoplayback/videoplaybackview/tsrc/testcontrolscontroller/src/testcontrolscontroller.cpp Tue Oct 05 09:26:49 2010 +0300 @@ -15,7 +15,7 @@ * */ -// Version : %version: 17 % +// Version : %version: 18 % #include #include @@ -37,7 +37,7 @@ #include "videoplaybackcontrolconfiguration.h" #include "thumbnailmanager_qt.h" #include "videoplaybackdocumentloader.h" -#include "hbvolumesliderpopup.h" +#include "videoplaybackvolumecontrol.h" #include "videoservices.h" #include "xqserviceutilxtra.h" @@ -158,13 +158,7 @@ // // validate 'TvOutConnected' // - verifyHandleEventTvOutResult(true, true); - - // - // video-only, validate volume control is dimmed - // - QVERIFY( mController->mVolumeControl->mValue == 0 ); - QVERIFY( mController->mVolumeControl->isEnabled() == false ); + verifyHandleEventTvOutResult( true, true ); // // verify 'title' (via mClipName) is set properly @@ -425,7 +419,7 @@ int value = 40; mController->handleEvent( EControlCmdSetVolume, value ); - QVERIFY( mController->mVolumeControl->mValue == value ); + QVERIFY( mController->mVolumeControl->mVolume == value ); cleanup(); } @@ -1169,10 +1163,10 @@ // emit signal, this will in turns invoke mController sendVideo() slot // emit commandSignal(); - + // // emit again. - // + // emit commandSignal(); // @@ -1367,4 +1361,20 @@ cleanup(); } +// ------------------------------------------------------------------------------------------------- +// TestControlsController::testVolumeSteps +// ------------------------------------------------------------------------------------------------- +// +void TestControlsController::testVolumeSteps() +{ + init(); + + int volume = 5; + mViewWrapper->mVolumeSteps = volume; + + QVERIFY( mViewWrapper->VolumeSteps() == volume ); + + cleanup(); +} + // End of file