MCL/sf/app/videoplayer: comparison videoplayback/videoplaybackcontrols/tsrc/videoplaybackcontrols_test/src/videoplaybackcontrolstestblocks.cpp

equal deleted inserted replaced

-:2d690156cf8f
+:315810614048
 *
 * Description:  Test Harness for VideoPlayControls
 *
 */
-// Version : %version: e003sa33#12 %
+// Version : %version: 13 %
 // [INCLUDE FILES] - do not remove
 #include <e32svr.h>
 #include <e32std.h>
 // TV out cases
 ENTRY( "TvOutConnected", CVideoPlaybackControlsTest::TvOutConnected ),
 ENTRY( "TvOutDisconnected", CVideoPlaybackControlsTest::TvOutDisconnected ),
 ENTRY( "HandleErrors", CVideoPlaybackControlsTest::HandleErrors ),
 // Media Details Viewer
 ENTRY( "ShowMediaDetailsViewer", CVideoPlaybackControlsTest::ShowMediaDetailsViewer ),
 ENTRY( "CloseMediaDetailsViewer", CVideoPlaybackControlsTest::CloseMediaDetailsViewer )
 //ADD NEW ENTRY HERE
 // [test cases entries] - Do not remove
 };
 const TInt count = sizeof( KFunctions ) / sizeof( TStifFunctionInfo );
 TInt result = KErrGeneral;
 if ( iAvkonViewAppUi->OrientationCanBeChanged() )
 {
-TRAPD( err, iAvkonViewAppUi->SetOrientationL( CAknAppUiBase::EAppUiOrientationLandscape ) );
+MPX_TRAPD( err, iAvkonViewAppUi->SetOrientationL( CAknAppUiBase::EAppUiOrientationLandscape ) );
 MPX_DEBUG(_L("CVideoPlaybackControlsTest::CreateController() err = [%d]"), err);
 }
 TRect rect = iAvkonViewAppUi->ApplicationRect();
-TRAP
+MPX_TRAP
 (
 result,
 {
 iContainer = CMPXVideoPlaybackContainer::NewL( aFileName );
 {
 MPX_DEBUG(_L("CVideoPlaybackControlsTest::DeleteControls()"));
 TInt err = KErrNone;
-TRAP( err, iAvkonViewAppUi->SetOrientationL( CAknAppUiBase::EAppUiOrientationAutomatic ) );
+MPX_TRAP( err, iAvkonViewAppUi->SetOrientationL( CAknAppUiBase::EAppUiOrientationAutomatic ) );
 if ( iController )
 {
 delete iController;
 iController = NULL;
 if ( result == KErrNone )
 {
 MPX_DEBUG(_L("CVideoPlaybackControlsTest::SetAspectRatio() [%d]"), aspectRatio);
-TRAP( result, iController->HandleEventL( EMPXControlCmdSetAspectRatio, aspectRatio ) );
+MPX_TRAP(
+result,
+{
+iController->HandleEventL( EMPXControlCmdSetAspectRatio, aspectRatio );
+iController->HandleEventL( EMPXControlCmdCreateAspectRatioIcon );
+} );
 }
 return result;
 }
 if ( result == KErrNone )
 {
 MPX_DEBUG(_L("CVideoPlaybackControlsTest::SetVolume() [%d]"), volume);
-TRAP( result, iController->HandleEventL( EMPXControlCmdSetVolume,
+MPX_TRAP( result, iController->HandleEventL( EMPXControlCmdSetVolume,
 (TInt64)volume ) );
 }
 return result;
 }
 MPX_DEBUG(_L("CVideoPlaybackControlsTest::SetDuration() [%d]"), duration);
 if ( result == KErrNone )
 {
-TRAP( result, iController->HandleEventL( EMPXControlCmdSetDuration,
+MPX_TRAP( result, iController->HandleEventL( EMPXControlCmdSetDuration,
 (TInt64)duration ) );
 }
 return result;
 }
 {
 result = aItem.GetNextInt ( value );
 if ( result == KErrNone  )
 {
-TRAP( result, iContainer->ExpectedResultL( command, value ) );
+MPX_TRAP( result, iContainer->ExpectedResultL( command, value ) );
 }
 }
 return result;
 }
 TInt state = 0;
 TInt result = aItem.GetNextInt( state );
 if ( result == KErrNone )
 {
-TRAP( result, iController->HandleEventL( EMPXControlCmdStateChanged, state ) );
+MPX_TRAP( result, iController->HandleEventL( EMPXControlCmdStateChanged, state ) );
 }
 return result;
 }
 //
 TInt CVideoPlaybackControlsTest::AddDefaultFileDetails()
 {
 MPX_DEBUG(_L("CVideoPlaybackControlsTest::AddDefaultFileDetails()"));
-TRAPD( result, iContainer->AddFileDetailsL() );
+MPX_TRAPD( result, iContainer->AddFileDetailsL() );
 return result;
 }
 // -------------------------------------------------------------------------------------------------
 //
 TInt CVideoPlaybackControlsTest::AddAudioOnlyFileDetails()
 {
 MPX_DEBUG(_L("CVideoPlaybackControlsTest::AddAudioOnlyFileDetails()"));
-TRAPD( result, iContainer->AddFileDetailsL( EFalse ) );
+MPX_TRAPD( result, iContainer->AddFileDetailsL( EFalse ) );
 return result;
 }
 // -------------------------------------------------------------------------------------------------
 //
 TInt CVideoPlaybackControlsTest::AddLongFileDetails()
 {
 MPX_DEBUG(_L("CVideoPlaybackControlsTest::AddLongFileDetails()"));
-TRAPD( result, iContainer->AddLongFileDetailsL() );
+MPX_TRAPD( result, iContainer->AddLongFileDetailsL() );
 return result;
 }
 // -------------------------------------------------------------------------------------------------
 // CVideoPlaybackControlsTest::AddSameARFileDetails
 // -------------------------------------------------------------------------------------------------
 //
 TInt CVideoPlaybackControlsTest::AddSameARFileDetails()
 {
-	MPX_ENTER_EXIT( _L( "CVideoPlaybackControlsTest::AddSameARFileDetails()" ) );
+MPX_ENTER_EXIT( _L( "CVideoPlaybackControlsTest::AddSameARFileDetails()" ) );
 MPX_TRAPD( result, iContainer->AddSameARFileDetailsL() );
 return result;
 }
 // CVideoPlaybackControlsTest::AddEmptyTitleFileDetails
 // -------------------------------------------------------------------------------------------------
 //
 TInt CVideoPlaybackControlsTest::AddEmptyTitleFileDetailsL()
 {
-	MPX_ENTER_EXIT( _L( "CVideoPlaybackControlsTest::AddEmptyTitleFileDetailsL()" ) );
+MPX_ENTER_EXIT( _L( "CVideoPlaybackControlsTest::AddEmptyTitleFileDetailsL()" ) );
 MPX_TRAPD( result, iContainer->AddEmptyTitleFileDetailsL() );
 return result;
 }
 //  ix = ( ScreenWidth - 1 ) - oldPosition.iY - YOffset
 //      I am not sure why they subtract 1 from the screen width, but they do
 //      The YOffset can be read from the wsini.ini file
 //
 //  iy = oldPosition.iX
 //
 tapPoint.iX = ( 360 - 1 ) - aPosition.iY - 12;
 tapPoint.iY = aPosition.iX;
 #endif
 MPX_DEBUG(_L("   tapPosition = (%d,%d)"), tapPoint.iX, tapPoint.iY);
 TRawEvent pointer;
 if ( aType == TPointerEvent::EButton1Down )
 // CVideoPlaybackControlsTest::SetDownLoadSize
 // -------------------------------------------------------------------------------------------------
 //
 TInt CVideoPlaybackControlsTest::SetDownLoadSize( CStifItemParser& aItem )
 {
-	MPX_DEBUG(_L("CVideoPlaybackControlsTest::SetExpectedResult()"));
+MPX_DEBUG(_L("CVideoPlaybackControlsTest::SetExpectedResult()"));
 TInt size = 0;
 TInt result = aItem.GetNextInt( size );
 if ( result == KErrNone )
 {
-TRAP( result, iController->HandleEventL( EMPXControlCmdSetDownloadSize, size ) );
+MPX_TRAP( result, iController->HandleEventL( EMPXControlCmdSetDownloadSize, size ) );
 }
 return result;
 }
 // CVideoPlaybackControlsTest::SetDownLoadPostion
 // -------------------------------------------------------------------------------------------------
 //
 TInt CVideoPlaybackControlsTest::SetDownLoadPostion( CStifItemParser&  aItem )
 {
-	MPX_DEBUG(_L("CVideoPlaybackControlsTest::SetExpectedResult()"));
+MPX_DEBUG(_L("CVideoPlaybackControlsTest::SetExpectedResult()"));
 TInt position = 0;
 TInt result = aItem.GetNextInt( position );
 if ( result == KErrNone )
 {
-TRAP( result, iController->HandleEventL( EMPXControlCmdSetPosition, position ) );
+MPX_TRAP( result, iController->HandleEventL( EMPXControlCmdSetPosition, position ) );
 }
 return result;
 }
 TInt position = 0;
 TInt result = aItem.GetNextInt( position );
 if ( result == KErrNone )
 {
-TRAP( result, iController->HandleEventL( EMPXControlCmdDownloadUpdated, position ) );
+MPX_TRAP( result, iController->HandleEventL( EMPXControlCmdDownloadUpdated, position ) );
 }
 return result;
 }
 // CVideoPlaybackControlsTest::SetDownLoadPaused
 // -------------------------------------------------------------------------------------------------
 //
 TInt CVideoPlaybackControlsTest::SetDownLoadPaused()
 {
-	MPX_DEBUG(_L("CVideoPlaybackControlsTest::SetDownLoadPaused()"));
+MPX_DEBUG(_L("CVideoPlaybackControlsTest::SetDownLoadPaused()"));
-TRAPD( result, iController->HandleEventL( EMPXControlCmdSetDownloadPaused) );
+MPX_TRAPD( result, iController->HandleEventL( EMPXControlCmdSetDownloadPaused) );
 return result;
 }
 // -------------------------------------------------------------------------------------------------
 // CVideoPlaybackControlsTest::ClearDownLoadPaused
 // -------------------------------------------------------------------------------------------------
 //
 TInt CVideoPlaybackControlsTest::ClearDownLoadPaused()
 {
-	MPX_DEBUG(_L("CVideoPlaybackControlsTest::ClearDownLoadPaused()"));
+MPX_DEBUG(_L("CVideoPlaybackControlsTest::ClearDownLoadPaused()"));
-TRAPD( result, iController->HandleEventL( EMPXControlCmdClearDownloadPaused) );
+MPX_TRAPD( result, iController->HandleEventL( EMPXControlCmdClearDownloadPaused) );
 return result;
 }
 // -------------------------------------------------------------------------------------------------
 // CVideoPlaybackControlsTest::TvOutConnected
 // -------------------------------------------------------------------------------------------------
 //
 TInt CVideoPlaybackControlsTest::TvOutConnected()
 {
-	MPX_DEBUG(_L("CVideoPlaybackControlsTest::TvOutConnected()"));
+MPX_DEBUG(_L("CVideoPlaybackControlsTest::TvOutConnected()"));
-TRAPD( result, iController->HandleEventL( EMPXControlCmdTvOutConnected ) );
+MPX_TRAPD( result, iController->HandleEventL( EMPXControlCmdTvOutConnected ) );
 return result;
 }
 // -------------------------------------------------------------------------------------------------
 // CVideoPlaybackControlsTest::TvOutDisconnected
 // -------------------------------------------------------------------------------------------------
 //
 TInt CVideoPlaybackControlsTest::TvOutDisconnected()
 {
-	MPX_DEBUG(_L("CVideoPlaybackControlsTest::TvOutDisconnected()"));
+MPX_DEBUG(_L("CVideoPlaybackControlsTest::TvOutDisconnected()"));
-TRAPD( result, iController->HandleEventL( EMPXControlCmdTvOutDisconnected ) );
+MPX_TRAPD( result, iController->HandleEventL( EMPXControlCmdTvOutDisconnected ) );
 return result;
 }
 // -------------------------------------------------------------------------------------------------
 //
 TInt CVideoPlaybackControlsTest::HandleErrors()
 {
 MPX_DEBUG(_L("CVideoPlaybackControlsTest::HandleErrors()"));
-TRAPD( result, iController->HandleEventL( EMPXControlCmdHandleErrors ) );
+MPX_TRAPD( result, iController->HandleEventL( EMPXControlCmdHandleErrors ) );
 return result;
 }
 // -------------------------------------------------------------------------------------------------
 TInt key = 0;
 TInt result = aItem.GetNextInt( key );
-TRAP( result, iController->HandleEventL( EMPXControlCmdSoftKeyPressed, key ) );
+MPX_TRAP( result, iController->HandleEventL( EMPXControlCmdSoftKeyPressed, key ) );
 return result;
 }
 // -------------------------------------------------------------------------------------------------
 //
 TInt CVideoPlaybackControlsTest::ShowControls()
 {
 MPX_DEBUG(_L("CVideoPlaybackControlsTest::ShowControls()"));
-TRAPD( result, iController->HandleEventL( EMPXControlCmdShowControls ) );
+MPX_TRAPD( result, iController->HandleEventL( EMPXControlCmdShowControls ) );
 return result;
 }
 // -------------------------------------------------------------------------------------------------
 //
 TInt CVideoPlaybackControlsTest::ToggleVisibility()
 {
 MPX_DEBUG(_L("CVideoPlaybackControlsTest::ToggleVisibility()"));
-TRAPD( result, iController->HandleEventL( EMPXControlCmdToggleVisibility ) );
+MPX_TRAPD( result, iController->HandleEventL( EMPXControlCmdToggleVisibility ) );
 return result;
 }
 // -------------------------------------------------------------------------------------------------
 //
 TInt CVideoPlaybackControlsTest::HandleBackgroundEvnet()
 {
 MPX_DEBUG(_L("CVideoPlaybackControlsTest::HandleBackgroundEvnet()"));
-TRAPD( result, iController->HandleEventL( EMPXControlCmdHandleBackgroundEvent ) );
+MPX_TRAPD( result, iController->HandleEventL( EMPXControlCmdHandleBackgroundEvent ) );
 return result;
 }
 // -------------------------------------------------------------------------------------------------
 //
 TInt CVideoPlaybackControlsTest::ShowMediaDetailsViewer()
 {
 MPX_DEBUG(_L("CVideoPlaybackControlsTest::ShowMediaDetailsViewer()"));
-TRAPD( result, iController->HandleEventL( EMPXControlCmdShowFileDetailsViewer ) );
+MPX_TRAPD( result, iController->HandleEventL( EMPXControlCmdShowFileDetailsViewer ) );
 return result;
 }
 // -------------------------------------------------------------------------------------------------
 //
 TInt CVideoPlaybackControlsTest::CloseMediaDetailsViewer()
 {
 MPX_DEBUG(_L("CVideoPlaybackControlsTest::CloseMediaDetailsViewer()"));
-TRAPD( result, iController->HandleEventL( EMPXControlCmdCloseFileDetailsViewer ) );
+MPX_TRAPD( result, iController->HandleEventL( EMPXControlCmdCloseFileDetailsViewer ) );
 return result;
 }
 // ========================== OTHER EXPORTED FUNCTIONS =============================================

branch	RCL_3
changeset 21	315810614048
parent 11	8970fbd719ec