Skip to content

Q
qgroundcontrol
Commit 9d2204be authored by Patrick José Pereira's avatar Patrick José Pereira
Browse files
Options

qgcunittest: Move to pragma once 

Signed-off-by: 's avatarPatrick José Pereira <patrickelectric@gmail.com>
parent d96fc0a6
Hide whitespace changes
Inline Side-by-side
Showing with 47 additions and 73 deletions
src/qgcunittest/FileDialogTest.h
View file @ 9d2204be
/****************************************************************************
*
* (c) 2009-2016 QGROUNDCONTROL PROJECT <http://www.qgroundcontrol.org>
* (c) 2009-2018 QGROUNDCONTROL PROJECT <http://www.qgroundcontrol.org>
*
* QGroundControl is licensed according to the terms in the file
* COPYING.md in the root of the source code directory.
......@@ -13,8 +13,7 @@
///
/// @author Don Gagne <don@thegagnes.com>
#ifndef FILEDIALOGTEST_H
#define FILEDIALOGTEST_H
#pragma once
#include "UnitTest.h"
......@@ -33,4 +32,3 @@ private slots:
void _fileDialogExpectedIncorrect_test(void);
};
#endif
src/qgcunittest/FileManagerTest.h
View file @ 9d2204be
/****************************************************************************
*
* (c) 2009-2016 QGROUNDCONTROL PROJECT <http://www.qgroundcontrol.org>
* (c) 2009-2018 QGROUNDCONTROL PROJECT <http://www.qgroundcontrol.org>
*
* QGroundControl is licensed according to the terms in the file
* COPYING.md in the root of the source code directory.
......@@ -8,8 +8,7 @@
****************************************************************************/
#ifndef FileManagerTEST_H
#define FileManagerTEST_H
#pragma once
#include <QObject>
#include <QtTest/QtTest>
......@@ -77,4 +76,3 @@ private:
QStringList _fileListReceived;
};
#endif
src/qgcunittest/FlightGearTest.h
View file @ 9d2204be
/****************************************************************************
*
* (c) 2009-2016 QGROUNDCONTROL PROJECT <http://www.qgroundcontrol.org>
* (c) 2009-2018 QGROUNDCONTROL PROJECT <http://www.qgroundcontrol.org>
*
* QGroundControl is licensed according to the terms in the file
* COPYING.md in the root of the source code directory.
......@@ -8,8 +8,7 @@
****************************************************************************/
#ifndef FLIGHTGEARTEST_H
#define FLIGHTGEARTEST_H
#pragma once
#include "UnitTest.h"
#include "TCPLink.h"
......@@ -31,4 +30,3 @@ private slots:
void _parseUIArguments_test(void);
};
#endif
src/qgcunittest/GeoTest.h
View file @ 9d2204be
/****************************************************************************
*
* (c) 2009-2016 QGROUNDCONTROL PROJECT <http://www.qgroundcontrol.org>
* (c) 2009-2018 QGROUNDCONTROL PROJECT <http://www.qgroundcontrol.org>
*
* QGroundControl is licensed according to the terms in the file
* COPYING.md in the root of the source code directory.
......@@ -13,8 +13,7 @@
///
/// @author David Goodman <dagoodma@gmail.com>
#ifndef GEOTEST_H
#define GEOTEST_H
#pragma once
#include <QGeoCoordinate>
......@@ -38,4 +37,3 @@ private:
QGeoCoordinate _origin;
};
#endif // GEOTEST_H
src/qgcunittest/LinkManagerTest.h
View file @ 9d2204be
/****************************************************************************
*
* (c) 2009-2016 QGROUNDCONTROL PROJECT <http://www.qgroundcontrol.org>
* (c) 2009-2018 QGROUNDCONTROL PROJECT <http://www.qgroundcontrol.org>
*
* QGroundControl is licensed according to the terms in the file
* COPYING.md in the root of the source code directory.
......@@ -8,8 +8,7 @@
****************************************************************************/
#ifndef LINKMANAGERTEST_H
#define LINKMANAGERTEST_H
#pragma once
#include "UnitTest.h"
#include "LinkManager.h"
......@@ -54,4 +53,3 @@ private:
const char* _rgSignals[_cSignals];
};
#endif
src/qgcunittest/MainWindowTest.h
View file @ 9d2204be
/****************************************************************************
*
* (c) 2009-2016 QGROUNDCONTROL PROJECT <http://www.qgroundcontrol.org>
* (c) 2009-2018 QGROUNDCONTROL PROJECT <http://www.qgroundcontrol.org>
*
* QGroundControl is licensed according to the terms in the file
* COPYING.md in the root of the source code directory.
......@@ -13,8 +13,7 @@
///
/// @author Don Gagne <don@thegagnes.com>
#ifndef MAINWINDOWTEST_H
#define MAINWINDOWTEST_H
#pragma once
#include "UnitTest.h"
#include "MainWindow.h"
......@@ -31,4 +30,3 @@ private:
void _connectWindowClose_test(MAV_AUTOPILOT autopilot);
};
#endif
src/qgcunittest/MavlinkLogTest.h
View file @ 9d2204be
/****************************************************************************
*
* (c) 2009-2016 QGROUNDCONTROL PROJECT <http://www.qgroundcontrol.org>
* (c) 2009-2018 QGROUNDCONTROL PROJECT <http://www.qgroundcontrol.org>
*
* QGroundControl is licensed according to the terms in the file
* COPYING.md in the root of the source code directory.
......@@ -13,8 +13,7 @@
///
/// @author Don Gagne <don@thegagnes.com>
#ifndef MAVLINKLOGTEST_H
#define MAVLINKLOGTEST_H
#pragma once
#include "UnitTest.h"
......@@ -48,4 +47,3 @@ private:
static const char* _saveLogFilename; ///< Filename to save log files to
};
#endif
src/qgcunittest/MessageBoxTest.h
View file @ 9d2204be
/****************************************************************************
*
* (c) 2009-2016 QGROUNDCONTROL PROJECT <http://www.qgroundcontrol.org>
* (c) 2009-2018 QGROUNDCONTROL PROJECT <http://www.qgroundcontrol.org>
*
* QGroundControl is licensed according to the terms in the file
* COPYING.md in the root of the source code directory.
......@@ -13,8 +13,7 @@
///
/// @author Don Gagne <don@thegagnes.com>
#ifndef MESSAGEBOXTEST_H
#define MESSAGEBOXTEST_H
#pragma once
#include "UnitTest.h"
......@@ -33,4 +32,3 @@ private slots:
void _badResponseButton_test(void);
};
#endif
src/qgcunittest/MultiSignalSpy.h
View file @ 9d2204be
/****************************************************************************
*
* (c) 2009-2016 QGROUNDCONTROL PROJECT <http://www.qgroundcontrol.org>
* (c) 2009-2018 QGROUNDCONTROL PROJECT <http://www.qgroundcontrol.org>
*
* QGroundControl is licensed according to the terms in the file
* COPYING.md in the root of the source code directory.
......@@ -8,8 +8,7 @@
****************************************************************************/
#ifndef MULTISIGNALSPY_H
#define MULTISIGNALSPY_H
#pragma once
#include <QObject>
#include <QSignalSpy>
......@@ -80,4 +79,3 @@ private:
bool _timeout;
};
#endif
src/qgcunittest/RadioConfigTest.h
View file @ 9d2204be
/****************************************************************************
*
* (c) 2009-2016 QGROUNDCONTROL PROJECT <http://www.qgroundcontrol.org>
* (c) 2009-2018 QGROUNDCONTROL PROJECT <http://www.qgroundcontrol.org>
*
* QGroundControl is licensed according to the terms in the file
* COPYING.md in the root of the source code directory.
......@@ -8,8 +8,7 @@
****************************************************************************/
#ifndef RadioConfigTest_H
#define RadioConfigTest_H
#pragma once
#include "UnitTest.h"
#include "MockLink.h"
......@@ -116,4 +115,3 @@ private:
RadioComponentController* _controller;
};
#endif
src/qgcunittest/TCPLinkTest.h
View file @ 9d2204be
/****************************************************************************
*
* (c) 2009-2016 QGROUNDCONTROL PROJECT <http://www.qgroundcontrol.org>
* (c) 2009-2018 QGROUNDCONTROL PROJECT <http://www.qgroundcontrol.org>
*
* QGroundControl is licensed according to the terms in the file
* COPYING.md in the root of the source code directory.
......@@ -8,8 +8,7 @@
****************************************************************************/
#ifndef TCPLINKTEST_H
#define TCPLINKTEST_H
#pragma once
#include "UnitTest.h"
#include "TCPLink.h"
......@@ -67,4 +66,3 @@ private:
const char* _rgSignals[_cSignals];
};
#endif
src/qgcunittest/TCPLoopBackServer.h
View file @ 9d2204be
/****************************************************************************
*
* (c) 2009-2016 QGROUNDCONTROL PROJECT <http://www.qgroundcontrol.org>
* (c) 2009-2018 QGROUNDCONTROL PROJECT <http://www.qgroundcontrol.org>
*
* QGroundControl is licensed according to the terms in the file
* COPYING.md in the root of the source code directory.
......@@ -8,8 +8,7 @@
****************************************************************************/
#ifndef TCPLOOPBACKSERVER_H
#define TCPLOOPBACKSERVER_H
#pragma once
#include <QThread>
#include <QTcpServer>
......@@ -44,4 +43,3 @@ private:
QTcpSocket* _tcpSocket;
};
#endif
\ No newline at end of file
src/qgcunittest/UnitTest.h
View file @ 9d2204be
/****************************************************************************
*
* (c) 2009-2016 QGROUNDCONTROL PROJECT <http://www.qgroundcontrol.org>
* (c) 2009-2018 QGROUNDCONTROL PROJECT <http://www.qgroundcontrol.org>
*
* QGroundControl is licensed according to the terms in the file
* COPYING.md in the root of the source code directory.
......@@ -13,9 +13,8 @@
///
/// @author Don Gagne <don@thegagnes.com>
#ifndef UNITTEST_H
#define UNITTEST_H
#ifndef __mobile__
#pragma once
#include <QObject>
#include <QtTest>
......@@ -42,15 +41,15 @@ class UnitTest : public QObject
public:
UnitTest(void);
virtual ~UnitTest(void);
/// @brief Called to run all the registered unit tests
/// @param singleTest Name of test to just run a single test
static int run(QString& singleTest);
/// @brief Sets up for an expected QGCMessageBox
/// @param response Response to take on message box
void setExpectedMessageBox(QMessageBox::StandardButton response);
/// @brief Types for UnitTest::setExpectedFileDialog
enum FileDialogType {
getExistingDirectory,
......@@ -58,30 +57,30 @@ public:
getOpenFileNames,
getSaveFileName
};
/// @brief Sets up for an expected QGCQFileDialog
/// @param type Type of expected file dialog
/// @param response Files to return from call. Multiple files only supported by getOpenFileNames
void setExpectedFileDialog(enum FileDialogType type, QStringList response);
enum {
expectFailNoFailure = 1 << 0, ///< not expecting any failures
expectFailNoDialog = 1 << 1, ///< expecting a failure due to no dialog displayed
expectFailBadResponseButton = 1 << 2, ///< expecting a failure due to bad button response (QGCMessageBox only)
expectFailWrongFileDialog = 1 << 3 ///< expecting one dialog type, got the wrong type (QGCQFileDialog ony)
};
/// @brief Check whether a message box was displayed and correctly responded to
// @param Expected failure response flags
void checkExpectedMessageBox(int expectFailFlags = expectFailNoFailure);
/// Checks that the specified number of message boxes where shown. Do not call setExpectedMessageBox when using this method.
void checkMultipleExpectedMessageBox(int messageCount);
/// @brief Check whether a message box was displayed and correctly responded to
// @param Expected failure response flags
void checkExpectedFileDialog(int expectFailFlags = expectFailNoFailure);
/// @brief Adds a unit test to the list. Should only be called by UnitTestWrapper.
static void _addTest(QObject* test);
......@@ -102,18 +101,18 @@ public:
void changeFactValue(Fact* fact, double increment = 0);
protected slots:
// These are all pure virtuals to force the derived class to implement each one and in turn
// call the UnitTest private implementation.
/// @brief Called before each test.
/// Make sure to call UnitTest::init first in your derived class.
virtual void init(void);
/// @brief Called after each test.
/// Make sure to call UnitTest::cleanup last in your derived class.
virtual void cleanup(void);
protected:
void _connectMockLink(MAV_AUTOPILOT autopilot = MAV_AUTOPILOT_PX4);
void _disconnectMockLink(void);
......@@ -133,38 +132,38 @@ private slots:
private:
// When the app is running in unit test mode the QGCMessageBox methods are re-routed here.
static QMessageBox::StandardButton _messageBox(QMessageBox::Icon icon,
const QString& title,
const QString& text,
QMessageBox::StandardButtons buttons,
QMessageBox::StandardButton defaultButton);
// This allows the private call to _messageBox
friend class QGCMessageBox;
// When the app is running in unit test mode the QGCQFileDialog methods are re-routed here.
static QString _getExistingDirectory(
QWidget* parent,
const QString& caption,
const QString& dir,
QFileDialog::Options options);
static QString _getOpenFileName(
QWidget* parent,
const QString& caption,
const QString& dir,
const QString& filter,
QFileDialog::Options options);
static QStringList _getOpenFileNames(
QWidget* parent,
const QString& caption,
const QString& dir,
const QString& filter,
QFileDialog::Options options);
static QString _getSaveFileName(
QWidget* parent,
const QString& caption,
......@@ -186,14 +185,14 @@ private:
static bool _badResponseButton; ///< Attempt to repond to expected message box with button not being displayed
static QMessageBox::StandardButton _messageBoxResponseButton; ///< Response to next message box
static int _missedMessageBoxCount; ///< Count of message box not checked with call to messageBoxWasDisplayed
// Catch QGCQFileDialog calls
static bool _fileDialogRespondedTo; ///< File dialog was responded to
static bool _fileDialogResponseSet; ///< true: _fileDialogResponse was set by a call to UnitTest::setExpectedFileDialog
static QStringList _fileDialogResponse; ///< Response to next file dialog
static enum FileDialogType _fileDialogExpectedType; ///< type of file dialog expected to show
static int _missedFileDialogCount; ///< Count of file dialogs not checked with call to UnitTest::fileDialogWasDisplayed
bool _unitTestRun; ///< true: Unit Test was run
bool _initCalled; ///< true: UnitTest::_init was called
bool _cleanupCalled; ///< true: UnitTest::_cleanup was called
......@@ -213,5 +212,4 @@ private:
QSharedPointer<T> _unitTest;
};
#endif // Android
#endif
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment