diff -r 208a4ba3894c -r 6832643895f7 searchui/stateproviders/searchstateprovider/tsrc/t_searchstateprovider/src/t_searchprogressivestate.cpp --- a/searchui/stateproviders/searchstateprovider/tsrc/t_searchstateprovider/src/t_searchprogressivestate.cpp Mon May 03 12:32:15 2010 +0300 +++ b/searchui/stateproviders/searchstateprovider/tsrc/t_searchstateprovider/src/t_searchprogressivestate.cpp Fri May 14 15:53:17 2010 +0300 @@ -71,6 +71,36 @@ // delete wind; } +void SearchStateProviderTest::testsetSelectedCategories() + { + SearchProgressiveState* progressiveState = new SearchProgressiveState(); + QEvent *event = new QEvent(QEvent::None); + progressiveState->onEntry(event); + progressiveState->getSettingCategory(0, true); + progressiveState->getSettingCategory(1, true); + progressiveState->getSettingCategory(2, true); + progressiveState->getSettingCategory(3, true); + progressiveState->getSettingCategory(4, true); + progressiveState->getSettingCategory(5, true); + progressiveState->getSettingCategory(6, true); + progressiveState->getSettingCategory(7, true); + progressiveState->setSelectedCategories(); + delete progressiveState; + } +void SearchStateProviderTest::testgetAppIconFromAppId() + { + + SearchProgressiveState* progressiveState = new SearchProgressiveState(); + QEvent *event = new QEvent(QEvent::None); + progressiveState->onEntry(event); + for (int i = 0; i < progressiveState->mIconArray.count(); i++) + { + QVERIFY(!(progressiveState->mIconArray.at(i).isNull())); + } + progressiveState->mIconArray.clear(); + delete progressiveState; + } + // --------------------------------------------------------------------------- // --------------------------------------------------------------------------- // @@ -89,7 +119,7 @@ progressiveState->onAsyncSearchComplete(0, -1); QCOMPARE(progressiveState->mResultcount,0); - progressiveState->mSearchHandler->searchAsync("a", "_aggregate"); + progressiveState->mSearchHandler->searchAsync("txt", "_aggregate"); QTest::qWait(100); //QCOMPARE(progressiveState->mResultcount,10); @@ -105,7 +135,7 @@ SearchProgressiveState* progressiveState = new SearchProgressiveState(); QEvent *event = new QEvent(QEvent::None); - progressiveState->mSelectedCategory.insert(1, true); + progressiveState->mSelectedCategory.insert(5, true); progressiveState->onEntry(event); // progressiveState->mSearchHandler = progressiveState->mSearchHandlerList.at(1); progressiveState->onGetDocumentComplete(0, NULL); @@ -113,9 +143,9 @@ progressiveState->onGetDocumentComplete(-1, NULL); QCOMPARE(progressiveState->mModel->rowCount(),0); - progressiveState->startNewSearch("a"); + progressiveState->startNewSearch("d"); QTest::qWait(2000); - int i =progressiveState->mModel->rowCount(); + int i = progressiveState->mModel->rowCount(); QVERIFY(progressiveState->mModel->rowCount()); delete progressiveState; // delete wind; @@ -123,21 +153,6 @@ // --------------------------------------------------------------------------- // --------------------------------------------------------------------------- // -void SearchStateProviderTest::testgetSettingCategory() - { - // HbMainWindow* wind = mainWindow(); - SearchProgressiveState* progressiveState = new SearchProgressiveState(); - QEvent *event = new QEvent(QEvent::None); - progressiveState->onEntry(event); - - progressiveState->getSettingCategory(3, true); - QCOMPARE(progressiveState->mSelectedCategory.count(),1); - delete progressiveState; - // delete wind; - } -// --------------------------------------------------------------------------- -// --------------------------------------------------------------------------- -// void SearchStateProviderTest::testopenResultitem() { // HbMainWindow* wind = mainWindow(); @@ -155,72 +170,21 @@ delete progressiveState; // delete wind; } + // --------------------------------------------------------------------------- // --------------------------------------------------------------------------- // -void SearchStateProviderTest::testcreateSuggestionLink() +void SearchStateProviderTest::testgetSettingCategory() { - SearchProgressiveState* progressiveState = new SearchProgressiveState(); - QEvent *event = new QEvent(QEvent::None); - progressiveState->onEntry(event); - - progressiveState->createSuggestionLink(true); - QCOMPARE(progressiveState->mModel->rowCount(), 0); - progressiveState->createSuggestionLink(false); - QCOMPARE(progressiveState->mModel->rowCount(), 1); - delete progressiveState; - } -// --------------------------------------------------------------------------- -// --------------------------------------------------------------------------- -// -void SearchStateProviderTest::testnoResultsFound() - { + // HbMainWindow* wind = mainWindow(); SearchProgressiveState* progressiveState = new SearchProgressiveState(); QEvent *event = new QEvent(QEvent::None); progressiveState->onEntry(event); - progressiveState->noResultsFound(NULL); - QCOMPARE(progressiveState->mModel->rowCount(),0); - - progressiveState->noResultsFound("aaa"); - QCOMPARE(progressiveState->mModel->rowCount(),1); - + progressiveState->getSettingCategory(3, true); + QCOMPARE(progressiveState->mSelectedCategory.count(),1); delete progressiveState; - } -// --------------------------------------------------------------------------- -// --------------------------------------------------------------------------- -// -void SearchStateProviderTest::testclear() - { - SearchProgressiveState* progressiveState = new SearchProgressiveState(); - QEvent *event = new QEvent(QEvent::None); - progressiveState->onEntry(event); - - progressiveState->noResultsFound("aaa"); - QCOMPARE(progressiveState->mModel->rowCount(),1); - progressiveState->clear(); - QCOMPARE(progressiveState->mModel->rowCount(),0); - - delete progressiveState; - } -// --------------------------------------------------------------------------- -// --------------------------------------------------------------------------- -// -void SearchStateProviderTest::testsearchOnCategory() - { - - } -// --------------------------------------------------------------------------- -// --------------------------------------------------------------------------- -// -void SearchStateProviderTest::teststartNewSearch() - { - SearchProgressiveState* progressiveState = new SearchProgressiveState(); - QEvent *event = new QEvent(QEvent::None); - progressiveState->mSelectedCategory.insert(1, true); - progressiveState->onEntry(event); - progressiveState->startNewSearch("a"); - delete progressiveState; + // delete wind; } // --------------------------------------------------------------------------- @@ -236,8 +200,16 @@ QCOMPARE(spy.count(), 1); delete progressiveState; } - -void SearchStateProviderTest::test_CustomizeGoButton() +void SearchStateProviderTest::teststartNewSearch() + { + SearchProgressiveState* progressiveState = new SearchProgressiveState(); + QEvent *event = new QEvent(QEvent::None); + progressiveState->mSelectedCategory.insert(5, true); + progressiveState->onEntry(event); + progressiveState->startNewSearch("d"); + delete progressiveState; + } +void SearchStateProviderTest::test_customizeGoButton() { SearchProgressiveState* progressiveState = new SearchProgressiveState(); QEvent *event = new QEvent(QEvent::None); @@ -248,21 +220,6 @@ QVERIFY(progressiveState->mSearchPanel->isProgressive()); delete progressiveState; } - -void SearchStateProviderTest::testgetAppIconFromAppId() - { - - SearchProgressiveState* progressiveState = new SearchProgressiveState(); - QEvent *event = new QEvent(QEvent::None); - progressiveState->onEntry(event); - for (int i = 0; i < progressiveState->mIconArray.count(); i++) - { - QVERIFY(!(progressiveState->mIconArray.at(i).isNull())); - } - progressiveState->mIconArray.clear(); - delete progressiveState; - } - // --------------------------------------------------------------------------- // --------------------------------------------------------------------------- // @@ -285,18 +242,26 @@ //SearchStateProviderTest::testcancelsearch() // --------------------------------------------------------------------------- // -void SearchStateProviderTest::testcancelsearch() +void SearchStateProviderTest::testcancelSearch() { SearchProgressiveState* progressiveState = new SearchProgressiveState(); QEvent *event = new QEvent(QEvent::None); progressiveState->onEntry(event); progressiveState->getSettingCategory(5, true); - progressiveState->startNewSearch("a"); + progressiveState->startNewSearch("d"); progressiveState->cancelSearch(); delete progressiveState; } -void SearchStateProviderTest::testhandleokanderror() +void SearchStateProviderTest::testgetrowsInserted() + { + + } +void SearchStateProviderTest::testgetrowsRemoved() + { + + } +void SearchStateProviderTest::testhandleOkError() { SearchProgressiveState* progressiveState = new SearchProgressiveState(); QEvent *event = new QEvent(QEvent::None); @@ -307,6 +272,67 @@ progressiveState->handleError(ret, QString()); delete progressiveState; } +void SearchStateProviderTest::test_viewingCompleted() + { + + } +// --------------------------------------------------------------------------- +// --------------------------------------------------------------------------- +// +void SearchStateProviderTest::testsearchOnCategory() + { + + } +// --------------------------------------------------------------------------- +// --------------------------------------------------------------------------- +// +void SearchStateProviderTest::testclear() + { + SearchProgressiveState* progressiveState = new SearchProgressiveState(); + QEvent *event = new QEvent(QEvent::None); + progressiveState->onEntry(event); + + progressiveState->noResultsFound("aaa"); + QCOMPARE(progressiveState->mModel->rowCount(),1); + progressiveState->clear(); + QCOMPARE(progressiveState->mModel->rowCount(),0); + + delete progressiveState; + } + +// --------------------------------------------------------------------------- +// --------------------------------------------------------------------------- +// +void SearchStateProviderTest::testnoResultsFound() + { + SearchProgressiveState* progressiveState = new SearchProgressiveState(); + QEvent *event = new QEvent(QEvent::None); + progressiveState->onEntry(event); + + progressiveState->noResultsFound(NULL); + QCOMPARE(progressiveState->mModel->rowCount(),0); + + progressiveState->noResultsFound("aaa"); + QCOMPARE(progressiveState->mModel->rowCount(),1); + + delete progressiveState; + } + +// --------------------------------------------------------------------------- +// --------------------------------------------------------------------------- +// +void SearchStateProviderTest::testcreateSuggestionLink() + { + SearchProgressiveState* progressiveState = new SearchProgressiveState(); + QEvent *event = new QEvent(QEvent::None); + progressiveState->onEntry(event); + + progressiveState->createSuggestionLink(true); + QCOMPARE(progressiveState->mModel->rowCount(), 0); + progressiveState->createSuggestionLink(false); + QCOMPARE(progressiveState->mModel->rowCount(), 1); + delete progressiveState; + } void SearchStateProviderTest::testTDisplayMode2Format() { SearchProgressiveState* progressiveState = new SearchProgressiveState(); @@ -335,30 +361,50 @@ delete progressiveState; } -void SearchStateProviderTest::testsetSelectedCategories() +void SearchStateProviderTest::testfromSymbianCFbsBitmap() + { + + } +void SearchStateProviderTest::testgetDrivefromMediaId() + { + SearchProgressiveState* progressiveState = new SearchProgressiveState(); + QEvent *event = new QEvent(QEvent::None); + progressiveState->mSelectedCategory.insert(1, false); + progressiveState->mSelectedCategory.insert(3, false); + progressiveState->mSelectedCategory.insert(4, false); + progressiveState->mSelectedCategory.insert(5, false); + progressiveState->mSelectedCategory.insert(6, false); + progressiveState->mSelectedCategory.insert(7, false); + + progressiveState->mSelectedCategory.insert(2, true); + progressiveState->onEntry(event); + progressiveState->startNewSearch("3gpp"); + QTest::qWait(200); + QModelIndex index = progressiveState->mModel->index(1, 0); + QStandardItem* item = progressiveState->mModel->itemFromIndex(index); + QString uid = progressiveState->getDrivefromMediaId(item->data( + Qt::UserRole + 2).toString()); + //QVERIFY(uid.length()); + delete progressiveState; + } +void SearchStateProviderTest::testLaunchApplicationL() { SearchProgressiveState* progressiveState = new SearchProgressiveState(); QEvent *event = new QEvent(QEvent::None); progressiveState->onEntry(event); - progressiveState->getSettingCategory(0, true); - progressiveState->getSettingCategory(1, true); - progressiveState->getSettingCategory(2, true); - progressiveState->getSettingCategory(3, true); - progressiveState->getSettingCategory(4, true); - progressiveState->getSettingCategory(5, true); - progressiveState->getSettingCategory(6, true); - progressiveState->getSettingCategory(7, true); - progressiveState->setSelectedCategories(); + progressiveState->LaunchApplicationL(TUid::Uid(0x20011383)); delete progressiveState; } - -void SearchStateProviderTest::testfilterdoc() +// --------------------------------------------------------------------------- +// --------------------------------------------------------------------------- +// +void SearchStateProviderTest::testfilterDoc() { - - SearchProgressiveState* progressiveState = new SearchProgressiveState(); - QEvent *event = new QEvent(QEvent::None); - progressiveState->onEntry(event); - progressiveState->filterDoc(NULL,"Name"); - delete progressiveState; - + SearchProgressiveState* progressiveState = new SearchProgressiveState(); + QEvent *event = new QEvent(QEvent::None); + progressiveState->mSelectedCategory.insert(5, true); + progressiveState->onEntry(event); + progressiveState->startNewSearch("d"); + QTest::qWait(200); + delete progressiveState; }