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
74690d82
Commit
74690d82
authored
Jun 14, 2014
by
Don Gagne
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Updated for threading changes
parent
a8559d6e
Changes
1
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
6 additions
and
2 deletions
+6
-2
TCPLinkTest.cc
src/qgcunittest/TCPLinkTest.cc
+6
-2
No files found.
src/qgcunittest/TCPLinkTest.cc
View file @
74690d82
...
@@ -111,7 +111,9 @@ void TCPLinkUnitTest::_connectFail_test(void)
...
@@ -111,7 +111,9 @@ void TCPLinkUnitTest::_connectFail_test(void)
Q_ASSERT
(
_multiSpy
);
Q_ASSERT
(
_multiSpy
);
Q_ASSERT
(
_multiSpy
->
checkNoSignals
()
==
true
);
Q_ASSERT
(
_multiSpy
->
checkNoSignals
()
==
true
);
QCOMPARE
(
_link
->
connect
(),
false
);
// With the new threading model connect will always succeed. We only get an error signal
// for a failed connected.
QCOMPARE
(
_link
->
connect
(),
true
);
// Make sure we get a linkError signal with the right link name
// Make sure we get a linkError signal with the right link name
QCOMPARE
(
_multiSpy
->
waitForSignalByIndex
(
communicationErrorSignalIndex
,
1000
),
true
);
QCOMPARE
(
_multiSpy
->
waitForSignalByIndex
(
communicationErrorSignalIndex
,
1000
),
true
);
...
@@ -119,10 +121,12 @@ void TCPLinkUnitTest::_connectFail_test(void)
...
@@ -119,10 +121,12 @@ void TCPLinkUnitTest::_connectFail_test(void)
QList
<
QVariant
>
arguments
=
_multiSpy
->
getSpyByIndex
(
communicationErrorSignalIndex
)
->
takeFirst
();
QList
<
QVariant
>
arguments
=
_multiSpy
->
getSpyByIndex
(
communicationErrorSignalIndex
)
->
takeFirst
();
QCOMPARE
(
arguments
.
at
(
0
).
toString
(),
_link
->
getName
());
QCOMPARE
(
arguments
.
at
(
0
).
toString
(),
_link
->
getName
());
_multiSpy
->
clearSignalByIndex
(
communicationErrorSignalIndex
);
_multiSpy
->
clearSignalByIndex
(
communicationErrorSignalIndex
);
_link
->
disconnect
();
// Try to connect again to make sure everything was cleaned up correctly from previous failed connection
// Try to connect again to make sure everything was cleaned up correctly from previous failed connection
QCOMPARE
(
_link
->
connect
(),
fals
e
);
QCOMPARE
(
_link
->
connect
(),
tru
e
);
// Make sure we get a linkError signal with the right link name
// Make sure we get a linkError signal with the right link name
QCOMPARE
(
_multiSpy
->
waitForSignalByIndex
(
communicationErrorSignalIndex
,
1000
),
true
);
QCOMPARE
(
_multiSpy
->
waitForSignalByIndex
(
communicationErrorSignalIndex
,
1000
),
true
);
...
...
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