--- a/videoplayback/hbvideoplaybackview/tsrc/teststatuspanecontrol/src/teststatuspanecontrol.cpp	Fri May 14 15:53:50 2010 +0300
+++ b/videoplayback/hbvideoplaybackview/tsrc/teststatuspanecontrol/src/teststatuspanecontrol.cpp	Thu May 27 12:53:14 2010 +0300
@@ -15,7 +15,7 @@
 * 
 */
 
-// Version : %version:  5 %
+// Version : %version:  6 %
 
 
 #include <hbapplication.h>
@@ -34,6 +34,7 @@
 #include "hbvideobaseplaybackview.h"
 #include "mpxvideoplaybackdocumentloader.h"
 #include "hblabel.h"
+#include "hbgroupbox.h"
 
 #define private public
 #define protected public
@@ -88,12 +89,11 @@
     
     mControlsController = new QMPXVideoPlaybackControlsController( mBaseVideoView, 
                                                                    mFileDetails );
-                                                                            
+
     mStatusPane = new QMPXVideoPlaybackStatusPaneControl( mControlsController, 
                                                           EMPXStatusPane,
                                                           NULL, 
-                                                          0 );                                                                
-
+                                                          0 );
 }
 
 // ---------------------------------------------------------------------------
@@ -104,6 +104,12 @@
 {
     MPX_ENTER_EXIT(_L("TestStatusPaneControl::cleanup()"));
 
+    if ( mStatusPane )
+    {
+        delete mStatusPane;
+        mStatusPane = NULL;    
+    }
+
     if ( mBaseVideoView )
     {
         delete mBaseVideoView;
@@ -121,12 +127,6 @@
         delete mControlsController;
         mControlsController = NULL;    
     }
-    
-    if ( mStatusPane )
-    {
-        delete mStatusPane;
-        mStatusPane = NULL;    
-    }
 }
 
 // ---------------------------------------------------------------------------
@@ -145,6 +145,8 @@
     mStatusPane->setMenu( mFileDetails );
     
     QVERIFY( mControlsController->view()->menu()->isEmpty() );
+
+    cleanup();
 }
 
 // ---------------------------------------------------------------------------
@@ -156,17 +158,22 @@
     MPX_ENTER_EXIT(_L("TestStatusPaneControl::testSetVisible()"));
 
     setup();    
-    
+    mStatusPane->updateControlsWithFileDetails( mFileDetails );
+
     // 1. Set visible
     mStatusPane->setVisible( true );    
-    QVERIFY( mStatusPane->isVisible() );  
-    QVERIFY( mStatusPane->mTitleLabel->isVisible() ); 
-    
+    QVERIFY( mControlsController->view()->mStatusBarVisible );  
+    QVERIFY( mControlsController->view()->mTitleBarVisible );  
+    QVERIFY( mStatusPane->mTitleLayout->isVisible() ); 
+
     // 2. Set invisible
-    mStatusPane->setVisible( false );    
-    QVERIFY( ! mStatusPane->isVisible() );  
-    QVERIFY( ! mStatusPane->mTitleLabel->isVisible() );     
-    
+    mStatusPane->setVisible( false );
+    QVERIFY( mControlsController->view()->menu()->isEmpty() ); 
+    QVERIFY( ! mControlsController->view()->mStatusBarVisible );  
+    QVERIFY( ! mControlsController->view()->mTitleBarVisible );  
+    QVERIFY( ! mStatusPane->mTitleLayout->isVisible() );
+
+    cleanup();
 }
 
 // ---------------------------------------------------------------------------
@@ -178,34 +185,36 @@
     MPX_ENTER_EXIT(_L("TestStatusPaneControl::testUpdateControlsWithFileDetails()"));
 
     setup(); 
-    
+
+    QString title = "Title";
+
     // 1. test for full creen mode
     mControlsController->mViewMode = EFullScreenView;
-    
-    mFileDetails->mTvOutConnected = true;
-    
+    mControlsController->mFileDetails->mTitle = title;
     mStatusPane->updateControlsWithFileDetails( mFileDetails );
-    
+
+    QVERIFY( mStatusPane->mTitleLabel->mString == title );
+    QVERIFY( mStatusPane->mTitleGroupBox->mString == title );
+    QVERIFY( mStatusPane->mTitleLabel->isVisible() );
+    QVERIFY( ! mStatusPane->mTitleGroupBox->isVisible() );
     QVERIFY( mControlsController->view()->viewFlags() == 
             HbView::HbViewFlags( HbView::ViewTitleBarTransparent | HbView::ViewStatusBarTransparent ));
-    
+
     // 2. test for detial view mode    
-    mControlsController->mViewMode = EDetailsView;
-    
-    mFileDetails->mTvOutConnected = true;
-    
+    mControlsController->mViewMode = EDetailsView;    
+    mStatusPane->updateControlsWithFileDetails( mFileDetails );
+
+    QVERIFY( mControlsController->view()->viewFlags() == HbView::ViewFlagNone );
+    QVERIFY( ! mStatusPane->mTitleLabel->isVisible() );     
+    QVERIFY( mStatusPane->mTitleGroupBox->isVisible() );
+
+    // 3. test for audio only mode    
+    mControlsController->mViewMode = EAudioOnlyView;
     mStatusPane->updateControlsWithFileDetails( mFileDetails );
 
     QVERIFY( mControlsController->view()->viewFlags() == HbView::ViewFlagNone );
 
-    // 3. test for audio only mode    
-    mControlsController->mViewMode = EAudioOnlyView;
-    
-    mFileDetails->mTvOutConnected = true;
-    
-    mStatusPane->updateControlsWithFileDetails( mFileDetails );
-
-    QVERIFY( mControlsController->view()->viewFlags() == HbView::ViewFlagNone );
+    cleanup();
 }
 
 // ---------------------------------------------------------------------------
@@ -225,6 +234,8 @@
     // 2. test for second block of cases:
     mStatusPane->setVisibility( EPbStateInitialising );        
     QVERIFY( mControlsController->view()->menu()->isEmpty() );
+
+    cleanup();
 }
 
 // ---------------------------------------------------------------------------
@@ -240,6 +251,8 @@
     mStatusPane->controlListUpdated( mFileDetails );    
         
     QVERIFY( mControlsController->view()->menu()->isEmpty() );
+
+    cleanup();
 }
 
 // ---------------------------------------------------------------------------
@@ -259,6 +272,8 @@
     QVERIFY( mControlsController->mTimerAction == EMPXTimerCancel ); 
     
     disconnect( this, SIGNAL( commandSignal() ), mStatusPane, SLOT( handleAboutToShow() ) );
+
+    cleanup();
 }
 
 // ---------------------------------------------------------------------------
@@ -277,7 +292,9 @@
     
     QVERIFY( mControlsController->mTimerAction == EMPXTimerReset ); 
     
-    disconnect( this, SIGNAL( commandSignal() ), mStatusPane, SLOT( handleAboutToHide() ) );    
+    disconnect( this, SIGNAL( commandSignal() ), mStatusPane, SLOT( handleAboutToHide() ) );
+
+    cleanup();
 }
 
 // ---------------------------------------------------------------------------
@@ -297,6 +314,8 @@
     QVERIFY( mControlsController->mViewMode  == EFullScreenView ); 
     
     disconnect( this, SIGNAL( commandSignal() ), mStatusPane, SLOT( openFullScreenView() ) );
+
+    cleanup();
 }
 
 // End of file