|
|
|
|
@ -52,125 +52,124 @@ using namespace Konsole; |
|
|
|
|
|
|
|
|
|
void PartTest::testFd() |
|
|
|
|
{ |
|
|
|
|
// start a pty process
|
|
|
|
|
KPtyProcess ptyProcess; |
|
|
|
|
ptyProcess.setProgram("/bin/ping",QStringList() << "localhost"); |
|
|
|
|
ptyProcess.setPtyChannels(KPtyProcess::AllChannels); |
|
|
|
|
ptyProcess.start(); |
|
|
|
|
QVERIFY(ptyProcess.waitForStarted()); |
|
|
|
|
|
|
|
|
|
int fd = ptyProcess.pty()->masterFd(); |
|
|
|
|
|
|
|
|
|
// create a Konsole part and attempt to connect to it
|
|
|
|
|
KParts::Part* terminalPart = createPart(); |
|
|
|
|
bool result = QMetaObject::invokeMethod(terminalPart,"openTeletype", |
|
|
|
|
Qt::DirectConnection,Q_ARG(int,fd)); |
|
|
|
|
QVERIFY(result); |
|
|
|
|
|
|
|
|
|
// suspend the KPtyDevice so that the embedded terminal gets a chance to
|
|
|
|
|
// read from the pty. Otherwise the KPtyDevice will simply read everything
|
|
|
|
|
// as soon as it becomes available and the terminal will not display any output
|
|
|
|
|
ptyProcess.pty()->setSuspended(true); |
|
|
|
|
|
|
|
|
|
KDialog* dialog = new KDialog(); |
|
|
|
|
dialog->setButtons(0); |
|
|
|
|
QVBoxLayout* layout = new QVBoxLayout(dialog->mainWidget()); |
|
|
|
|
layout->addWidget(new QLabel("Output of 'ping localhost' should appear in a terminal below for 5 seconds")); |
|
|
|
|
layout->addWidget(terminalPart->widget()); |
|
|
|
|
QTimer::singleShot(5000,dialog,SLOT(close())); |
|
|
|
|
dialog->exec(); |
|
|
|
|
|
|
|
|
|
delete terminalPart; |
|
|
|
|
delete dialog; |
|
|
|
|
ptyProcess.kill(); |
|
|
|
|
ptyProcess.waitForFinished(1000); |
|
|
|
|
// start a pty process
|
|
|
|
|
KPtyProcess ptyProcess; |
|
|
|
|
ptyProcess.setProgram("/bin/ping", QStringList() << "localhost"); |
|
|
|
|
ptyProcess.setPtyChannels(KPtyProcess::AllChannels); |
|
|
|
|
ptyProcess.start(); |
|
|
|
|
QVERIFY(ptyProcess.waitForStarted()); |
|
|
|
|
|
|
|
|
|
int fd = ptyProcess.pty()->masterFd(); |
|
|
|
|
|
|
|
|
|
// create a Konsole part and attempt to connect to it
|
|
|
|
|
KParts::Part* terminalPart = createPart(); |
|
|
|
|
bool result = QMetaObject::invokeMethod(terminalPart, "openTeletype", |
|
|
|
|
Qt::DirectConnection, Q_ARG(int, fd)); |
|
|
|
|
QVERIFY(result); |
|
|
|
|
|
|
|
|
|
// suspend the KPtyDevice so that the embedded terminal gets a chance to
|
|
|
|
|
// read from the pty. Otherwise the KPtyDevice will simply read everything
|
|
|
|
|
// as soon as it becomes available and the terminal will not display any output
|
|
|
|
|
ptyProcess.pty()->setSuspended(true); |
|
|
|
|
|
|
|
|
|
KDialog* dialog = new KDialog(); |
|
|
|
|
dialog->setButtons(0); |
|
|
|
|
QVBoxLayout* layout = new QVBoxLayout(dialog->mainWidget()); |
|
|
|
|
layout->addWidget(new QLabel("Output of 'ping localhost' should appear in a terminal below for 5 seconds")); |
|
|
|
|
layout->addWidget(terminalPart->widget()); |
|
|
|
|
QTimer::singleShot(5000, dialog, SLOT(close())); |
|
|
|
|
dialog->exec(); |
|
|
|
|
|
|
|
|
|
delete terminalPart; |
|
|
|
|
delete dialog; |
|
|
|
|
ptyProcess.kill(); |
|
|
|
|
ptyProcess.waitForFinished(1000); |
|
|
|
|
} |
|
|
|
|
void PartTest::testShortcutOverride() |
|
|
|
|
{ |
|
|
|
|
// FIXME: This test asks the user to press shortcut key sequences manually because
|
|
|
|
|
// the result is different than when sending the key press via QTest::keyClick()
|
|
|
|
|
//
|
|
|
|
|
// When the key presses are sent manually, Konsole::TerminalDisplay::event() is called
|
|
|
|
|
// and the overrideShortcut() signal is emitted by the part.
|
|
|
|
|
// When the key presses are sent automatically, the shortcut is triggered but
|
|
|
|
|
// Konsole::TerminalDisplay::event() is not called and the overrideShortcut() signal is
|
|
|
|
|
// not emitted by the part.
|
|
|
|
|
|
|
|
|
|
// Create a main window with a menu and a test
|
|
|
|
|
// action with a shortcut set to Ctrl+S, which is also used by the terminal
|
|
|
|
|
KMainWindow* mainWindow = new KMainWindow(); |
|
|
|
|
QMenu* fileMenu = mainWindow->menuBar()->addMenu("File"); |
|
|
|
|
QAction* testAction = fileMenu->addAction("Test"); |
|
|
|
|
testAction->setShortcut(QKeySequence(Qt::CTRL+Qt::Key_S)); |
|
|
|
|
connect(testAction,SIGNAL(triggered()),this,SLOT(shortcutTriggered())); |
|
|
|
|
|
|
|
|
|
// Create terminal part and embed in into the main window
|
|
|
|
|
KParts::Part* terminalPart = createPart(); |
|
|
|
|
QVERIFY(terminalPart); |
|
|
|
|
mainWindow->setCentralWidget(terminalPart->widget()); |
|
|
|
|
TerminalInterface* terminal = qobject_cast<TerminalInterface*>(terminalPart); |
|
|
|
|
QVERIFY(terminal); |
|
|
|
|
terminal->sendInput("Press Ctrl+S twice.\n"); |
|
|
|
|
mainWindow->show(); |
|
|
|
|
|
|
|
|
|
// Test shortcut with override disabled, so the shortcut will be triggered
|
|
|
|
|
_shortcutTriggered = false; |
|
|
|
|
_override = false; |
|
|
|
|
_overrideCalled = false; |
|
|
|
|
QVERIFY( connect(terminalPart,SIGNAL(overrideShortcut(QKeyEvent*,bool&)), |
|
|
|
|
this,SLOT(overrideShortcut(QKeyEvent*,bool&))) ); |
|
|
|
|
|
|
|
|
|
//QTest::keyClick(terminalPart->widget(),Qt::Key_S,Qt::ControlModifier);
|
|
|
|
|
_shortcutEventLoop = new QEventLoop(); |
|
|
|
|
_shortcutEventLoop->exec(); |
|
|
|
|
|
|
|
|
|
QVERIFY(_overrideCalled); |
|
|
|
|
QVERIFY(_shortcutTriggered); |
|
|
|
|
QVERIFY(!_override); |
|
|
|
|
|
|
|
|
|
// Test shortcut with override enabled, so the shortcut will not be triggered
|
|
|
|
|
_override = true; |
|
|
|
|
_overrideCalled = false; |
|
|
|
|
_shortcutTriggered = false; |
|
|
|
|
|
|
|
|
|
//QTest::keyClick(terminalPart->widget(),Qt::Key_S,Qt::ControlModifier);
|
|
|
|
|
_shortcutEventLoop->exec(); |
|
|
|
|
|
|
|
|
|
QVERIFY(_overrideCalled); |
|
|
|
|
QVERIFY(!_shortcutTriggered); |
|
|
|
|
QVERIFY(_override); |
|
|
|
|
|
|
|
|
|
delete _shortcutEventLoop; |
|
|
|
|
delete terminalPart; |
|
|
|
|
delete mainWindow; |
|
|
|
|
// FIXME: This test asks the user to press shortcut key sequences manually because
|
|
|
|
|
// the result is different than when sending the key press via QTest::keyClick()
|
|
|
|
|
//
|
|
|
|
|
// When the key presses are sent manually, Konsole::TerminalDisplay::event() is called
|
|
|
|
|
// and the overrideShortcut() signal is emitted by the part.
|
|
|
|
|
// When the key presses are sent automatically, the shortcut is triggered but
|
|
|
|
|
// Konsole::TerminalDisplay::event() is not called and the overrideShortcut() signal is
|
|
|
|
|
// not emitted by the part.
|
|
|
|
|
|
|
|
|
|
// Create a main window with a menu and a test
|
|
|
|
|
// action with a shortcut set to Ctrl+S, which is also used by the terminal
|
|
|
|
|
KMainWindow* mainWindow = new KMainWindow(); |
|
|
|
|
QMenu* fileMenu = mainWindow->menuBar()->addMenu("File"); |
|
|
|
|
QAction* testAction = fileMenu->addAction("Test"); |
|
|
|
|
testAction->setShortcut(QKeySequence(Qt::CTRL + Qt::Key_S)); |
|
|
|
|
connect(testAction, SIGNAL(triggered()), this, SLOT(shortcutTriggered())); |
|
|
|
|
|
|
|
|
|
// Create terminal part and embed in into the main window
|
|
|
|
|
KParts::Part* terminalPart = createPart(); |
|
|
|
|
QVERIFY(terminalPart); |
|
|
|
|
mainWindow->setCentralWidget(terminalPart->widget()); |
|
|
|
|
TerminalInterface* terminal = qobject_cast<TerminalInterface*>(terminalPart); |
|
|
|
|
QVERIFY(terminal); |
|
|
|
|
terminal->sendInput("Press Ctrl+S twice.\n"); |
|
|
|
|
mainWindow->show(); |
|
|
|
|
|
|
|
|
|
// Test shortcut with override disabled, so the shortcut will be triggered
|
|
|
|
|
_shortcutTriggered = false; |
|
|
|
|
_override = false; |
|
|
|
|
_overrideCalled = false; |
|
|
|
|
QVERIFY(connect(terminalPart, SIGNAL(overrideShortcut(QKeyEvent*, bool&)), |
|
|
|
|
this, SLOT(overrideShortcut(QKeyEvent*, bool&)))); |
|
|
|
|
|
|
|
|
|
//QTest::keyClick(terminalPart->widget(),Qt::Key_S,Qt::ControlModifier);
|
|
|
|
|
_shortcutEventLoop = new QEventLoop(); |
|
|
|
|
_shortcutEventLoop->exec(); |
|
|
|
|
|
|
|
|
|
QVERIFY(_overrideCalled); |
|
|
|
|
QVERIFY(_shortcutTriggered); |
|
|
|
|
QVERIFY(!_override); |
|
|
|
|
|
|
|
|
|
// Test shortcut with override enabled, so the shortcut will not be triggered
|
|
|
|
|
_override = true; |
|
|
|
|
_overrideCalled = false; |
|
|
|
|
_shortcutTriggered = false; |
|
|
|
|
|
|
|
|
|
//QTest::keyClick(terminalPart->widget(),Qt::Key_S,Qt::ControlModifier);
|
|
|
|
|
_shortcutEventLoop->exec(); |
|
|
|
|
|
|
|
|
|
QVERIFY(_overrideCalled); |
|
|
|
|
QVERIFY(!_shortcutTriggered); |
|
|
|
|
QVERIFY(_override); |
|
|
|
|
|
|
|
|
|
delete _shortcutEventLoop; |
|
|
|
|
delete terminalPart; |
|
|
|
|
delete mainWindow; |
|
|
|
|
} |
|
|
|
|
void PartTest::overrideShortcut(QKeyEvent* event,bool& override) |
|
|
|
|
void PartTest::overrideShortcut(QKeyEvent* event, bool& override) |
|
|
|
|
{ |
|
|
|
|
QVERIFY(override == true); |
|
|
|
|
if (event->modifiers() == Qt::ControlModifier && event->key() == Qt::Key_S)
|
|
|
|
|
{ |
|
|
|
|
_overrideCalled = true; |
|
|
|
|
override = _override; |
|
|
|
|
_shortcutEventLoop->exit(); |
|
|
|
|
} |
|
|
|
|
QVERIFY(override == true); |
|
|
|
|
if (event->modifiers() == Qt::ControlModifier && event->key() == Qt::Key_S) { |
|
|
|
|
_overrideCalled = true; |
|
|
|
|
override = _override; |
|
|
|
|
_shortcutEventLoop->exit(); |
|
|
|
|
} |
|
|
|
|
} |
|
|
|
|
void PartTest::shortcutTriggered() |
|
|
|
|
{ |
|
|
|
|
_shortcutTriggered = true; |
|
|
|
|
_shortcutTriggered = true; |
|
|
|
|
} |
|
|
|
|
|
|
|
|
|
KParts::Part* PartTest::createPart() |
|
|
|
|
{ |
|
|
|
|
KPluginLoader loader("libkonsolepart"); |
|
|
|
|
KPluginFactory* factory = loader.factory(); |
|
|
|
|
Q_ASSERT(factory); |
|
|
|
|
KPluginLoader loader("libkonsolepart"); |
|
|
|
|
KPluginFactory* factory = loader.factory(); |
|
|
|
|
Q_ASSERT(factory); |
|
|
|
|
|
|
|
|
|
KParts::Part* terminalPart = factory->create<KParts::Part>(this); |
|
|
|
|
KParts::Part* terminalPart = factory->create<KParts::Part>(this); |
|
|
|
|
|
|
|
|
|
return terminalPart; |
|
|
|
|
return terminalPart; |
|
|
|
|
} |
|
|
|
|
|
|
|
|
|
QTEST_KDEMAIN( PartTest , GUI ) |
|
|
|
|
QTEST_KDEMAIN(PartTest , GUI) |
|
|
|
|
|
|
|
|
|
#include "PartTest.moc" |
|
|
|
|
|
|
|
|
|
|
Kurt Hindenburg
14 years ago