diff -r 66b5fe3c07fd -r e6f74eb7f69f homescreenapp/stateplugins/hsapplibrarystateplugin/tsrc/t_allappsstate/src/t_allappsstate.cpp --- a/homescreenapp/stateplugins/hsapplibrarystateplugin/tsrc/t_allappsstate/src/t_allappsstate.cpp Wed Oct 06 16:06:24 2010 +0300 +++ b/homescreenapp/stateplugins/hsapplibrarystateplugin/tsrc/t_allappsstate/src/t_allappsstate.cpp Mon Oct 18 10:20:15 2010 +0300 @@ -317,12 +317,12 @@ { QScopedPointer machine(new QStateMachine(0)); - //QScopedPointer window(new HbMainWindow); - //HsScene::setInstance( new HsScene(window.data()) ); + QScopedPointer window(new HbMainWindow); + HsScene::setInstance( new HsScene(window.data()) ); HsMenuViewBuilder builder; HsMenuModeWrapper menuMode; - HsMainWindowMock mainWindow; + HsMainWindow mainWindow; QScopedPointer allAppsState(new HsAllAppsState( builder, menuMode, mainWindow, machine.data())); @@ -671,6 +671,48 @@ } #endif//Q_OS_SYMBIAN +// --------------------------------------------------------------------------- +// --------------------------------------------------------------------------- +// +#ifdef Q_OS_SYMBIAN +void MenuStatesTest::switchLayout() +{ +#ifdef Q_OS_SYMBIAN + User::ResetInactivityTime();//it should help for Viewserver11 panic +#ifdef UT_MEMORY_CHECK + __UHEAP_MARK; +#endif//UT_MEMORY_CHECK +#endif//Q_OS_SYMBIAN + { + QScopedPointer window(new HbMainWindow()); + + HsMenuViewBuilder builder; + HsMenuModeWrapper menuMode; + HsMainWindowMock mainWindow; + + QScopedPointer allAppsState(new HsAllAppsState( + builder, menuMode, mainWindow, 0)); + + allAppsState->setMenuOptions(); + QVERIFY(allAppsState->mListMenuAction); + QVERIFY(allAppsState->mGridMenuAction); + + allAppsState->gridMenuAction(); + QVERIFY(allAppsState->mGrid); + + allAppsState->listMenuAction(); + QVERIFY(!allAppsState->mGrid); + + QVERIFY(allAppsState); + } +#ifdef Q_OS_SYMBIAN +#ifdef UT_MEMORY_CHECK + __UHEAP_MARKEND; +#endif//UT_MEMORY_CHECK +#endif//Q_OS_SYMBIAN +} +#endif//Q_OS_SYMBIAN +