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
2cd9ce2d
Commit
2cd9ce2d
authored
Oct 30, 2015
by
Don Gagne
Browse files
Options
Browse Files
Download
Plain Diff
Merge pull request #2170 from DonLakeFlyer/UT
Unit Tests that will run with QT_FATAL_WARNINGS=1
parents
099c7a0a
73d508b2
Changes
3
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
6 additions
and
6 deletions
+6
-6
.travis.yml
.travis.yml
+1
-1
SetupViewTest.cc
src/VehicleSetup/SetupViewTest.cc
+1
-5
UnitTest.cc
src/qgcunittest/UnitTest.cc
+4
-0
No files found.
.travis.yml
View file @
2cd9ce2d
...
...
@@ -22,7 +22,7 @@ matrix:
sudo
:
false
-
os
:
osx
osx_image
:
xcode7
env
:
SPEC=macx-clang CONFIG=debug
env
:
SPEC=macx-clang CONFIG=debug
QT_FATAL_WARNINGS=1
-
os
:
osx
osx_image
:
xcode7
env
:
SPEC=macx-clang CONFIG=installer
...
...
src/VehicleSetup/SetupViewTest.cc
View file @
2cd9ce2d
...
...
@@ -63,10 +63,6 @@ void SetupViewTest::_clickThrough_test(void)
QTest
::
qWait
(
1000
);
}
// On MainWindow close we should get a message box telling the user to disconnect first.
setExpectedMessageBox
(
QGCMessageBox
::
Yes
);
_disconnectMockLink
();
_closeMainWindow
();
checkExpectedMessageBox
();
}
src/qgcunittest/UnitTest.cc
View file @
2cd9ce2d
...
...
@@ -417,5 +417,9 @@ void UnitTest::_closeMainWindow(bool cancelExpected)
mainWindowSpy
.
wait
(
2000
);
QCOMPARE
(
mainWindowSpy
.
count
(),
cancelExpected
?
0
:
1
);
// This leaves enough time for any dangling Qml components to get cleaned up.
// This prevents qWarning from bad references in Qml
QTest
::
qWait
(
1000
);
}
}
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