--- a/videocollection/videocollectionview/tsrc/testhintwidget/src/testhintwidget.cpp	Fri Jun 11 09:44:20 2010 +0300
+++ b/videocollection/videocollectionview/tsrc/testhintwidget/src/testhintwidget.cpp	Thu Jun 24 09:49:13 2010 +0300
@@ -203,19 +203,22 @@
     mTestObject->mServiceIconString = QString();
     mTestObject->activate();
     QVERIFY(mTestObject->mServiceIcon == 0);
-    QVERIFY(mTestObject->isVisible() == false);
-    QVERIFY(mTestObject->mActivated == false);
+    QVERIFY(mTestObject->isVisible() == true);
+    QVERIFY(mTestObject->mActivated == true);
     
     // mServiceIconPressedString empty.
     mTestObject->mServiceIconString = "test";
     mTestObject->mServiceIconPressedString = QString();
     mTestObject->activate();
     QVERIFY(mTestObject->mServiceIcon == 0);
-    QVERIFY(mTestObject->isVisible() == false);
-    QVERIFY(mTestObject->mActivated == false);
+    QVERIFY(mTestObject->isVisible() == true);
+    QVERIFY(mTestObject->mActivated == true);
     
     // successful case.
-    mTestObject->mServiceIconPressedString = "test2";
+    mTestObject->mActivated = false;
+    mTestObject->mServiceIconString = "qtg_mono_ovistore";
+    mTestObject->mServiceIconPressedString = "qtg_mono_ovistore";
+
     HbLabel *noVideosLabel = mUiLoader->findWidget<HbLabel>(DOCML_NAME_NO_VIDEOS_LABEL);
     QVERIFY(noVideosLabel);
     noVideosLabel->setVisible(false);
@@ -245,7 +248,6 @@
     
     // when serviceButton does not exist
     mTestObject->mServiceIcon = 0;
-    mTestObject->mAddVideosIcon = 0;
     HbDocumentLoader::mFindWidgetFails = true;
     mTestObject->deactivate();
     QVERIFY(mTestObject->mActivated == false);
@@ -266,17 +268,14 @@
     // when icons are non-null, but widget is not activated.
     mTestObject->setVisible(true);
     mTestObject->mServiceIcon = new HbIcon;
-    mTestObject->mAddVideosIcon = new HbIcon;
     mTestObject->deactivate();
     QVERIFY(mTestObject->mServiceIcon != 0);
-    QVERIFY(mTestObject->mAddVideosIcon != 0);
     QVERIFY(mTestObject->isVisible() == true);
     
     // when icons are non-null and widget is activated.
     mTestObject->mActivated = true;
     mTestObject->deactivate();
     QVERIFY(mTestObject->mServiceIcon == 0);
-    QVERIFY(mTestObject->mAddVideosIcon == 0);
     QVERIFY(mTestObject->isVisible() == false);
     
     cleanup();
@@ -294,7 +293,6 @@
     init(true);
     
     mTestObject->mServiceIcon = new HbIcon(QIcon(QPixmap(QSize(100,100))));
-    mTestObject->mAddVideosIcon = new HbIcon(QIcon(QPixmap(QSize(50,50))));
     mTestObject->mActivated = true;
     
     HbDocumentLoader::mFindWidgetFails = true;
@@ -318,9 +316,8 @@
     mainWnd->setOrientation(Qt::Horizontal);
     mTestObject->mButtonShown = true;
     mTestObject->setLevel(VideoHintWidget::Collection);
-    QVERIFY(serviceButton->isVisible());
+    QVERIFY(!serviceButton->isVisible());
     QVERIFY(serviceButton->icon().isNull() == false);
-    QVERIFY(serviceButton->icon().qicon().cacheKey() == mTestObject->mAddVideosIcon->qicon().cacheKey());    
     QVERIFY(hintLabel->isVisible() == false);
     
     mTestObject->mButtonShown = false;
@@ -379,4 +376,28 @@
     cleanup();
 }
 
+// ---------------------------------------------------------------------------
+// testSetButtonShown
+// ---------------------------------------------------------------------------
+//
+void TestHintWidget::testSetButtonShown()
+{
+    HbMainWindow *mainWnd = hbInstance->allMainWindows()[0];
+    
+    init(true);
+    
+    HbLabel *noVideosLabel = mUiLoader->findWidget<HbLabel>(DOCML_NAME_NO_VIDEOS_LABEL);
+    QVERIFY(noVideosLabel);
+    
+    mTestObject->mActivated = true;
+    noVideosLabel->setVisible(false);
+    mTestObject->setButtonShown(true);
+    QVERIFY(noVideosLabel->isVisible());
+    
+    mTestObject->mActivated = false;
+    noVideosLabel->setVisible(false);
+    mTestObject->setButtonShown(false);
+    QVERIFY(noVideosLabel->isVisible() == false);
+}
+
 // end of file