Skip to content
GitLab
Projects
Groups
Snippets
/
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
Menu
Open sidebar
Valentin Platzgummer
qgroundcontrol
Commits
1fb6b144
Commit
1fb6b144
authored
Dec 08, 2014
by
Don Gagne
Browse files
MainWindow now disallows close if active connections
So no need for connect window close test here
parent
cac402bb
Changes
2
Hide whitespace changes
Inline
Side-by-side
src/qgcunittest/MavlinkLogTest.cc
View file @
1fb6b144
...
...
@@ -170,32 +170,3 @@ void MavlinkLogTest::_connectLog_test(void)
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
);
}
src/qgcunittest/MavlinkLogTest.h
View file @
1fb6b144
...
...
@@ -46,7 +46,6 @@ private slots:
void
_bootLogDetectionSave_test
(
void
);
void
_bootLogDetectionZeroLength_test
(
void
);
void
_connectLog_test
(
void
);
void
_connectLogWindowClose_test
(
void
);
private:
void
_createTempLogFile
(
bool
zeroLength
);
...
...
Write
Preview
Supports
Markdown
0%
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment