diff -r 4eb2df7f7cbe -r ff53afa8ad05 videoplayback/hbvideoplaybackview/tsrc/testvideoplaybackview/src/testvideoplaybackview.cpp --- a/videoplayback/hbvideoplaybackview/tsrc/testvideoplaybackview/src/testvideoplaybackview.cpp Fri Apr 30 09:52:11 2010 +0300 +++ b/videoplayback/hbvideoplaybackview/tsrc/testvideoplaybackview/src/testvideoplaybackview.cpp Fri May 14 15:14:51 2010 +0300 @@ -15,7 +15,7 @@ * */ -// Version : %version: % +// Version : %version: 9 % #include #include @@ -134,13 +134,11 @@ verifyHandlePluginError( KErrMMDRMNotAuthorized ); verifyHandlePluginError( KErrCANoRights ); verifyHandlePluginError( KErrCANoPermission ); - verifyHandlePluginError( KMPXVideoTvOutPlaybackNotAllowedClose ); // // playback view remains open after displaying these error notes // verifyHandlePluginError( KMPXVideoCallOngoingError, false ); - verifyHandlePluginError( KMPXVideoTvOutPlaybackNotAllowed, false ); verifyHandlePluginError( KMPXVideoPlayOver2GDuringVoiceCallError, false ); // @@ -211,7 +209,7 @@ cleanup(); } -void TestVideoPlaybackView::testEvent() +void TestVideoPlaybackView::testEventFilter() { setup(); @@ -223,14 +221,14 @@ // // declare foreground/background event // - QEvent* windowActivate = new QEvent( QEvent::WindowActivate ); - QEvent* windowDeactivate = new QEvent( QEvent::WindowDeactivate ); + QEvent* appActivate = new QEvent( QEvent::ApplicationActivate ); + QEvent* appDeactivate = new QEvent( QEvent::ApplicationDeactivate ); // // verify the returned value (consumed) of HbVideoBasePlaybackView::event() - // for QEvent::WindowActivate is false + // for QEvent::ApplicationActivate is false // - QVERIFY( ! mVideoView->event( windowActivate ) ); + QVERIFY( ! mVideoView->eventFilter( NULL, appActivate ) ); // // verify view is in foreground @@ -239,9 +237,9 @@ // // verify the returned value (consumed) of HbVideoBasePlaybackView::event() - // for QEvent::WindowDeactivate is false + // for QEvent::ApplicationDeactivate is false // - QVERIFY( ! mVideoView->event( windowDeactivate ) ); + QVERIFY( ! mVideoView->eventFilter( NULL, appDeactivate ) ); // // verify view is in background @@ -251,10 +249,18 @@ // // clean up // - delete windowActivate; - windowActivate = NULL; - delete windowDeactivate; - windowDeactivate = NULL; + if ( appActivate ) + { + delete appActivate; + appActivate = NULL; + } + + if ( appDeactivate ) + { + delete appDeactivate; + appDeactivate = NULL; + } + cleanup(); }