Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
Q
qgroundcontrol
Project
Project
Details
Activity
Releases
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Boards
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
Valentin Platzgummer
qgroundcontrol
Commits
d5e79d3a
Commit
d5e79d3a
authored
Jul 06, 2014
by
Don Gagne
Browse files
Options
Browse Files
Download
Plain Diff
Merge pull request #743 from DonLakeFlyer/FTPUnitTestFix
FTP Unit Test fix
parents
25177682
238220b3
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
2 additions
and
4 deletions
+2
-4
QGCUASFileManagerTest.cc
src/qgcunittest/QGCUASFileManagerTest.cc
+1
-4
QGCUASFileView.cc
src/ui/QGCUASFileView.cc
+1
-0
No files found.
src/qgcunittest/QGCUASFileManagerTest.cc
View file @
d5e79d3a
...
...
@@ -146,15 +146,12 @@ void QGCUASFileManagerUnitTest::_listTest(void)
fileList
<<
"Ddir"
<<
"Ffoo"
<<
"Fbar"
;
_mockFileServer
.
setFileList
(
fileList
);
QStringList
fileListExpected
;
fileListExpected
<<
"dir/"
<<
"foo"
<<
"bar"
;
_fileListReceived
.
clear
();
_fileManager
->
listDirectory
(
"/"
);
QCOMPARE
(
_multiSpy
->
checkSignalByMask
(
resetStatusMessagesSignalMask
),
true
);
// We should be told to reset status messages
QCOMPARE
(
_multiSpy
->
checkNoSignalByMask
(
errorMessageSignalMask
),
true
);
// We should not get an error signals
QVERIFY
(
_fileListReceived
==
fileList
Expected
);
QVERIFY
(
_fileListReceived
==
fileList
);
}
void
QGCUASFileManagerUnitTest
::
_validateFileContents
(
const
QString
&
filePath
,
uint8_t
length
)
...
...
src/ui/QGCUASFileView.cc
View file @
d5e79d3a
...
...
@@ -106,6 +106,7 @@ void QGCUASFileView::_treeStatusMessage(const QString& msg)
}
}
else
{
Q_ASSERT
(
false
);
return
;
// Silence maybe-unitialized on type below
}
QTreeWidgetItem
*
item
;
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a 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