Browse Source

MainWindow now disallows close if active connections

So no need for connect window close test here
QGC4.4
Don Gagne 10 years ago
parent
commit
1fb6b144a9
  1. 29
      src/qgcunittest/MavlinkLogTest.cc
  2. 1
      src/qgcunittest/MavlinkLogTest.h

29
src/qgcunittest/MavlinkLogTest.cc

@ -170,32 +170,3 @@ void MavlinkLogTest::_connectLog_test(void)
QTest::qWait(1000); // Need to allow signals to move between threads to shutdown MainWindow QTest::qWait(1000); // Need to allow signals to move between threads to shutdown MainWindow
} }
void MavlinkLogTest::_connectLogWindowClose_test(void)
{
MainWindow* mainWindow = MainWindow::_create(NULL, MainWindow::CUSTOM_MODE_PX4);
Q_CHECK_PTR(mainWindow);
LinkManager* linkMgr = LinkManager::instance();
Q_CHECK_PTR(linkMgr);
MockLink* link = new MockLink();
Q_CHECK_PTR(link);
// FIXME: LinkManager/MainWindow needs to be re-architected so that you don't have to addLink to MainWindow to get things to work
mainWindow->addLink(link);
linkMgr->connectLink(link);
QTest::qWait(5000); // Give enough time for UI to settle and heartbeats to go through
// On Disconnect: We should get a getSaveFileName dialog.
QDir logSaveDir(QStandardPaths::writableLocation(QStandardPaths::DocumentsLocation));
QString logSaveFile(logSaveDir.filePath(_saveLogFilename));
setExpectedFileDialog(getSaveFileName, QStringList(logSaveFile));
// MainWindow deletes itself on close
mainWindow->close();
QTest::qWait(1000); // Need to allow signals to move between threads
checkExpectedFileDialog();
// Make sure the file is there and delete it
QCOMPARE(logSaveDir.remove(_saveLogFilename), true);
}

1
src/qgcunittest/MavlinkLogTest.h

@ -46,7 +46,6 @@ private slots:
void _bootLogDetectionSave_test(void); void _bootLogDetectionSave_test(void);
void _bootLogDetectionZeroLength_test(void); void _bootLogDetectionZeroLength_test(void);
void _connectLog_test(void); void _connectLog_test(void);
void _connectLogWindowClose_test(void);
private: private:
void _createTempLogFile(bool zeroLength); void _createTempLogFile(bool zeroLength);

Loading…
Cancel
Save