tst_qmenubar: remove dead code
Remove dead code (since at least Qt5.0) - does not work and is bitrotting since ages. Change-Id: Ieb34e42137bc40c4edea47656b153a47f0ae34cd Reviewed-by: Axel Spoerl <axel.spoerl@qt.io>bb10
parent
7c5cf8cae0
commit
5bb71bb88e
|
|
@ -93,13 +93,6 @@ private slots:
|
|||
#endif
|
||||
void allowActiveAndDisabled();
|
||||
void taskQTBUG56860_focus();
|
||||
void check_endKey();
|
||||
void check_homeKey();
|
||||
|
||||
// void check_mouse1_data();
|
||||
// void check_mouse1();
|
||||
// void check_mouse2_data();
|
||||
// void check_mouse2();
|
||||
|
||||
void check_altPress();
|
||||
void check_altClosePress();
|
||||
|
|
@ -784,85 +777,6 @@ void tst_QMenuBar::taskQTBUG56860_focus()
|
|||
|
||||
}
|
||||
|
||||
/*!
|
||||
If a popupmenu is active you can use home to go quickly to the first item in the menu.
|
||||
*/
|
||||
void tst_QMenuBar::check_homeKey()
|
||||
{
|
||||
// I'm temporarily shutting up this testcase.
|
||||
// Seems like the behaviour i'm expecting isn't ok.
|
||||
QSKIP("This test has been \"temporarily\" disabled at least since 2009 :)");
|
||||
|
||||
QEXPECT_FAIL( "0", "Popupmenu should respond to a Home key", Abort );
|
||||
|
||||
QMainWindow w;
|
||||
initWindowWithComplexMenuBar(w);
|
||||
w.show();
|
||||
QApplicationPrivate::setActiveWindow(&w);
|
||||
QVERIFY(QTest::qWaitForWindowActive(&w));
|
||||
|
||||
// select Popupmenu 2
|
||||
QTest::keyClick(static_cast<QWidget *>(0), Qt::Key_2, Qt::AltModifier );
|
||||
|
||||
// Simulate some keys
|
||||
QTest::keyClick(static_cast<QWidget *>(0), Qt::Key_Down );
|
||||
QTest::keyClick(static_cast<QWidget *>(0), Qt::Key_Down );
|
||||
QTest::keyClick(static_cast<QWidget *>(0), Qt::Key_Down );
|
||||
QTest::keyClick(static_cast<QWidget *>(0), Qt::Key_Home );
|
||||
// and press ENTER
|
||||
QTest::keyClick(static_cast<QWidget *>(0), Qt::Key_Enter );
|
||||
// Let's see if the correct slot is called...
|
||||
// QVERIFY2( m_complexActionTriggerCount[int('c')] == 1, "Popupmenu should respond to a Home key" );
|
||||
QCOMPARE(m_complexTriggerCount[int('c')], 1);
|
||||
QCOMPARE(m_complexTriggerCount[3], 0);
|
||||
QCOMPARE(m_complexTriggerCount[4], 0);
|
||||
QCOMPARE(m_complexTriggerCount[int('a')], 0);
|
||||
QCOMPARE(m_complexTriggerCount[int('b')], 0);
|
||||
QCOMPARE(m_complexTriggerCount[int('d')], 0);
|
||||
QCOMPARE(m_complexTriggerCount[int('e')], 0);
|
||||
QCOMPARE(m_complexTriggerCount[int('f')], 0);
|
||||
QCOMPARE(m_complexTriggerCount[int('g')], 0);
|
||||
QCOMPARE(m_complexTriggerCount[int('h')], 0);
|
||||
}
|
||||
|
||||
/*!
|
||||
If a popupmenu is active you can use end to go quickly to the last item in the menu.
|
||||
*/
|
||||
void tst_QMenuBar::check_endKey()
|
||||
{
|
||||
// I'm temporarily silenting this testcase.
|
||||
// Seems like the behaviour i'm expecting isn't ok.
|
||||
QSKIP("This test has been \"temporarily\" disabled at least since 2009 :)");
|
||||
|
||||
QEXPECT_FAIL( "0", "Popupmenu should respond to an End key", Abort );
|
||||
|
||||
QMainWindow w;
|
||||
initWindowWithComplexMenuBar(w);
|
||||
w.show();
|
||||
QApplicationPrivate::setActiveWindow(&w);
|
||||
QVERIFY(QTest::qWaitForWindowActive(&w));
|
||||
|
||||
// select Popupmenu 2
|
||||
QTest::keyClick(static_cast<QWidget *>(0), Qt::Key_2, Qt::AltModifier );
|
||||
|
||||
// Simulate some keys
|
||||
QTest::keyClick(static_cast<QWidget *>(0), Qt::Key_End );
|
||||
// and press ENTER
|
||||
QTest::keyClick(static_cast<QWidget *>(0), Qt::Key_Enter );
|
||||
// Let's see if the correct slot is called...
|
||||
// QVERIFY2( m_complexActionTriggerCount[int('h')] == 1, "Popupmenu should respond to an End key" );
|
||||
QCOMPARE(m_complexTriggerCount[int('h')], 1);//, "Popupmenu should respond to an End key");
|
||||
QCOMPARE(m_complexTriggerCount[3], 0);
|
||||
QCOMPARE(m_complexTriggerCount[4], 0);
|
||||
QCOMPARE(m_complexTriggerCount[int('a')], 0);
|
||||
QCOMPARE(m_complexTriggerCount[int('b')], 0);
|
||||
QCOMPARE(m_complexTriggerCount[int('c')], 0);
|
||||
QCOMPARE(m_complexTriggerCount[int('d')], 0);
|
||||
QCOMPARE(m_complexTriggerCount[int('e')], 0);
|
||||
QCOMPARE(m_complexTriggerCount[int('f')], 0);
|
||||
QCOMPARE(m_complexTriggerCount[int('g')], 0);
|
||||
}
|
||||
|
||||
/*!
|
||||
If a popupmenu is active you can use esc to hide the menu and then the
|
||||
menubar should become active.
|
||||
|
|
@ -918,112 +832,6 @@ void tst_QMenuBar::check_escKey()
|
|||
#endif
|
||||
|
||||
|
||||
// void tst_QMenuBar::check_mouse1_data()
|
||||
// {
|
||||
// QTest::addColumn<QString>("popup_item");
|
||||
// QTest::addColumn<int>("itemA_count");
|
||||
// QTest::addColumn<int>("itemB_count");
|
||||
|
||||
// QTest::newRow( "A" ) << QString( "Item A Ctrl+A" ) << 1 << 0;
|
||||
// QTest::newRow( "B" ) << QString( "Item B Ctrl+B" ) << 0 << 1;
|
||||
// }
|
||||
|
||||
// /*!
|
||||
// Check if the correct signals are emitted if we select a popupmenu.
|
||||
// */
|
||||
// void tst_QMenuBar::check_mouse1()
|
||||
// {
|
||||
// if (QSystem::curStyle() == "Motif")
|
||||
// QSKIP("This fails in Motif due to a bug in the testing framework");
|
||||
// QFETCH( QString, popup_item );
|
||||
// QFETCH( int, itemA_count );
|
||||
// QFETCH( int, itemB_count );
|
||||
|
||||
// // initComplexMenubar();
|
||||
// QVERIFY( !pm1->isActiveWindow() );
|
||||
// QVERIFY( !pm2->isActiveWindow() );
|
||||
|
||||
// QTest::qWait(1000);
|
||||
// QtTestMouse mouse;
|
||||
// mouse.mouseEvent( QtTestMouse::MouseClick, mb, "Menu &1", Qt::LeftButton );
|
||||
|
||||
// QVERIFY( pm1->isActiveWindow() );
|
||||
// QVERIFY( !pm2->isActiveWindow() );
|
||||
|
||||
// QTest::qWait(1000);
|
||||
// mouse.mouseEvent( QtTestMouse::MouseClick, pm1, popup_item, Qt::LeftButton );
|
||||
|
||||
// QCOMPARE(m_complexActionTriggerCount[3], 0);
|
||||
// QCOMPARE(m_complexActionTriggerCount[4], 0);
|
||||
// QCOMPARE(m_complexActionTriggerCount['a'], (uint)itemA_count); // this option should have fired
|
||||
// QCOMPARE(m_complexActionTriggerCount['b'], (uint)itemB_count);
|
||||
// QCOMPARE(m_complexActionTriggerCount['c'], 0);
|
||||
// QCOMPARE(m_complexActionTriggerCount['d'], 0);
|
||||
// QCOMPARE(m_complexActionTriggerCount['e'], 0);
|
||||
// QCOMPARE(m_complexActionTriggerCount['f'], 0);
|
||||
// QCOMPARE(m_complexActionTriggerCount['g'], 0);
|
||||
// }
|
||||
|
||||
// void tst_QMenuBar::check_mouse2_data()
|
||||
// {
|
||||
// QTest::addColumn<QString>("label");
|
||||
// QTest::addColumn<int>("itemA_count");
|
||||
// QTest::addColumn<int>("itemB_count");
|
||||
// QTest::addColumn<int>("itemC_count");
|
||||
// QTest::addColumn<int>("itemD_count");
|
||||
// QTest::addColumn<int>("itemE_count");
|
||||
// QTest::addColumn<int>("itemF_count");
|
||||
// QTest::addColumn<int>("itemG_count");
|
||||
// QTest::addColumn<int>("itemH_count");
|
||||
// QTest::addColumn<int>("menu3_count");
|
||||
|
||||
// QTest::newRow( "A" ) << QString( "Menu &1/Item A Ctrl+A" ) << 1 << 0 << 0 << 0 << 0 << 0 << 0 << 0 << 0;
|
||||
// QTest::newRow( "B" ) << QString( "Menu &1/Item B Ctrl+B" ) << 0 << 1 << 0 << 0 << 0 << 0 << 0 << 0 << 0;
|
||||
// QTest::newRow( "C" ) << QString( "Menu &2/Item C Ctrl+C" ) << 0 << 0 << 1 << 0 << 0 << 0 << 0 << 0 << 0;
|
||||
// QTest::newRow( "D" ) << QString( "Menu &2/Item D Ctrl+D" ) << 0 << 0 << 0 << 1 << 0 << 0 << 0 << 0 << 0;
|
||||
// QTest::newRow( "E" ) << QString( "Menu &2/Item E Ctrl+E" ) << 0 << 0 << 0 << 0 << 1 << 0 << 0 << 0 << 0;
|
||||
// QTest::newRow( "F" ) << QString( "Menu &2/Item F Ctrl+F" ) << 0 << 0 << 0 << 0 << 0 << 1 << 0 << 0 << 0;
|
||||
// QTest::newRow( "G" ) << QString( "Menu &2/Item G Ctrl+G" ) << 0 << 0 << 0 << 0 << 0 << 0 << 1 << 0 << 0;
|
||||
// QTest::newRow( "H" ) << QString( "Menu &2/Item H Ctrl+H" ) << 0 << 0 << 0 << 0 << 0 << 0 << 0 << 1 << 0;
|
||||
// QTest::newRow( "menu 3" ) << QString( "M&enu 3" ) << 0 << 0 << 0 << 0 << 0 << 0 << 0 << 0 << 1;
|
||||
// }
|
||||
|
||||
// /*!
|
||||
// Check if the correct signals are emitted if we select a popupmenu.
|
||||
// This time, we use a little bit more magic from the testframework.
|
||||
// */
|
||||
// void tst_QMenuBar::check_mouse2()
|
||||
// {
|
||||
// if (QSystem::curStyle() == "Motif")
|
||||
// QSKIP("This fails in Motif due to a bug in the testing framework");
|
||||
// QFETCH( QString, label );
|
||||
// QFETCH( int, itemA_count );
|
||||
// QFETCH( int, itemB_count );
|
||||
// QFETCH( int, itemC_count );
|
||||
// QFETCH( int, itemD_count );
|
||||
// QFETCH( int, itemE_count );
|
||||
// QFETCH( int, itemF_count );
|
||||
// QFETCH( int, itemG_count );
|
||||
// QFETCH( int, itemH_count );
|
||||
// QFETCH( int, menu3_count );
|
||||
|
||||
// // initComplexMenubar();
|
||||
// QtTestMouse mouse;
|
||||
// mouse.click( QtTestMouse::Menu, label, Qt::LeftButton );
|
||||
|
||||
// // check if the correct signals have fired
|
||||
// QCOMPARE(m_complexActionTriggerCount[3], (uint)menu3_count);
|
||||
// QCOMPARE(m_complexActionTriggerCount[4], 0);
|
||||
// QCOMPARE(m_complexActionTriggerCount['a'], (uint)itemA_count);
|
||||
// QCOMPARE(m_complexActionTriggerCount['b'], (uint)itemB_count);
|
||||
// QCOMPARE(m_complexActionTriggerCount['c'], (uint)itemC_count);
|
||||
// QCOMPARE(m_complexActionTriggerCount['d'], (uint)itemD_count);
|
||||
// QCOMPARE(m_complexActionTriggerCount['e'], (uint)itemE_count);
|
||||
// QCOMPARE(m_complexActionTriggerCount['f'], (uint)itemF_count);
|
||||
// QCOMPARE(m_complexActionTriggerCount['g'], (uint)itemG_count);
|
||||
// QCOMPARE(m_complexActionTriggerCount['h'], (uint)itemH_count);
|
||||
// }
|
||||
|
||||
void tst_QMenuBar::allowActiveAndDisabled()
|
||||
{
|
||||
QMenuBar menuBar;
|
||||
|
|
|
|||
Loading…
Reference in New Issue