Skip to content
GitLab
Menu
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
92c0b53c
Commit
92c0b53c
authored
Mar 04, 2015
by
Don Gagne
Browse files
Update tests for new toolbar
Also turn them back on
parent
05bd9273
Changes
4
Hide whitespace changes
Inline
Side-by-side
src/VehicleSetup/SetupViewTest.cc
View file @
92c0b53c
...
...
@@ -28,10 +28,11 @@
#include "MockLink.h"
#include "QGCMessageBox.h"
// TODO: This is not working in Windows. Needs to be updated for new tool bar any way.
//UT_REGISTER_TEST(SetupViewTest)
UT_REGISTER_TEST
(
SetupViewTest
)
SetupViewTest
::
SetupViewTest
(
void
)
SetupViewTest
::
SetupViewTest
(
void
)
:
_mainWindow
(
NULL
),
_mainToolBar
(
NULL
)
{
}
...
...
@@ -42,6 +43,9 @@ void SetupViewTest::init(void)
_mainWindow
=
MainWindow
::
_create
(
NULL
);
Q_CHECK_PTR
(
_mainWindow
);
_mainToolBar
=
_mainWindow
->
getMainToolBar
();
Q_ASSERT
(
_mainToolBar
);
}
void
SetupViewTest
::
cleanup
(
void
)
...
...
@@ -64,26 +68,10 @@ void SetupViewTest::_clickThrough_test(void)
linkMgr
->
connectLink
(
link
);
QTest
::
qWait
(
5000
);
// Give enough time for UI to settle and heartbeats to go through
// Find the Setup button and click it
// Tool Bar is now a QQuickWidget and cannot be manipulated like below
#if 0
QGCToolBar* toolbar = _mainWindow->findChild<QGCToolBar*>();
Q_ASSERT(toolbar);
QList<QToolButton*> buttons = toolbar->findChildren<QToolButton*>();
QToolButton* setupButton = NULL;
foreach(QToolButton* button, buttons) {
if (button->text() == "Setup") {
setupButton = button;
break;
}
}
Q_ASSERT(setupButton);
QTest::mouseClick(setupButton, Qt::LeftButton);
// Switch to the Setup view
_mainToolBar
->
onSetupView
();
QTest
::
qWait
(
1000
);
#endif
// Click through all the setup buttons
// FIXME: NYI
...
...
src/VehicleSetup/SetupViewTest.h
View file @
92c0b53c
...
...
@@ -29,6 +29,7 @@
#include "UnitTest.h"
#include "MainWindow.h"
#include "MainToolBar.h"
/// Click through test for Setup View buttons
class
SetupViewTest
:
public
UnitTest
...
...
@@ -45,7 +46,8 @@ private slots:
void
_clickThrough_test
(
void
);
private:
MainWindow
*
_mainWindow
;
MainWindow
*
_mainWindow
;
MainToolBar
*
_mainToolBar
;
};
#endif
src/qgcunittest/MainWindowTest.cc
View file @
92c0b53c
...
...
@@ -31,10 +31,11 @@
#include "MockLink.h"
#include "QGCMessageBox.h"
// TODO: This needs to be changed to accomodate the new QML based tool bar
// UT_REGISTER_TEST(MainWindowTest)
UT_REGISTER_TEST
(
MainWindowTest
)
MainWindowTest
::
MainWindowTest
(
void
)
MainWindowTest
::
MainWindowTest
(
void
)
:
_mainWindow
(
NULL
),
_mainToolBar
(
NULL
)
{
}
...
...
@@ -45,6 +46,9 @@ void MainWindowTest::init(void)
_mainWindow
=
MainWindow
::
_create
(
NULL
);
Q_CHECK_PTR
(
_mainWindow
);
_mainToolBar
=
_mainWindow
->
getMainToolBar
();
Q_ASSERT
(
_mainToolBar
);
}
void
MainWindowTest
::
cleanup
(
void
)
...
...
@@ -67,21 +71,17 @@ void MainWindowTest::_connectWindowClose_test(MAV_AUTOPILOT autopilot)
linkMgr
->
connectLink
(
link
);
QTest
::
qWait
(
5000
);
// Give enough time for UI to settle and heartbeats to go through
// Tool Bar is now a QQuickWidget and cannot be manipulated like below
#if 0
// Click through all top level toolbar buttons
QGCToolBar* toolbar = _mainWindow->findChild<QGCToolBar*>();
Q_ASSERT(toolbar);
// Cycle through all the top level views
_mainToolBar
->
onSetupView
();
QTest
::
qWait
(
1000
);
_mainToolBar
->
onPlanView
();
QTest
::
qWait
(
1000
);
_mainToolBar
->
onFlyView
();
QTest
::
qWait
(
1000
);
_mainToolBar
->
onAnalyzeView
();
QTest
::
qWait
(
1000
);
QList<QToolButton*> buttons = toolbar->findChildren<QToolButton*>();
foreach(QToolButton* button, buttons) {
if (!button->menu()) {
QTest::mouseClick(button, Qt::LeftButton);
QTest::qWait(1000);
}
}
#endif
// On MainWindow close we should get a message box telling the user to disconnect first. Cancel should do nothing.
setExpectedMessageBox
(
QGCMessageBox
::
Cancel
);
_mainWindow
->
close
();
...
...
src/qgcunittest/MainWindowTest.h
View file @
92c0b53c
...
...
@@ -31,6 +31,7 @@
#include "UnitTest.h"
#include "MainWindow.h"
#include "MainToolBar.h"
class
MainWindowTest
:
public
UnitTest
{
...
...
@@ -48,7 +49,9 @@ private slots:
private:
void
_connectWindowClose_test
(
MAV_AUTOPILOT
autopilot
);
MainWindow
*
_mainWindow
;
MainWindow
*
_mainWindow
;
MainToolBar
*
_mainToolBar
;
};
#endif
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