From 193e7f8b16b5d5a40320ab1a480cafdeb8a1794a Mon Sep 17 00:00:00 2001 From: Don Gagne Date: Sat, 31 Oct 2015 10:44:34 -0700 Subject: [PATCH] Centralize unit test declaration location Also turn on MavlinkLogTest --- QGCApplication.pro | 1 + src/FactSystem/FactSystemTestGeneric.cc | 2 - src/FactSystem/FactSystemTestPX4.cc | 2 - src/MissionItemTest.cc | 2 - src/MissionManager/MissionControllerTest.cc | 2 - src/MissionManager/MissionManagerTest.cc | 3 - src/VehicleSetup/SetupViewTest.cc | 2 - src/qgcunittest/FileDialogTest.cc | 2 - src/qgcunittest/FileManagerTest.cc | 2 - src/qgcunittest/FlightGearTest.cc | 2 - src/qgcunittest/GeoTest.cc | 2 - src/qgcunittest/LinkManagerTest.cc | 2 - src/qgcunittest/MainWindowTest.cc | 3 - src/qgcunittest/MavlinkLogTest.cc | 3 - src/qgcunittest/MessageBoxTest.cc | 2 - src/qgcunittest/PX4RCCalibrationTest.cc | 1 - src/qgcunittest/TCPLinkTest.cc | 4 -- src/qgcunittest/UnitTest.h | 2 +- src/qgcunittest/UnitTestList.cc | 70 +++++++++++++++++++++ 19 files changed, 72 insertions(+), 37 deletions(-) create mode 100644 src/qgcunittest/UnitTestList.cc diff --git a/QGCApplication.pro b/QGCApplication.pro index 3ec9e9cab..33de0add2 100644 --- a/QGCApplication.pro +++ b/QGCApplication.pro @@ -488,6 +488,7 @@ SOURCES += \ src/qgcunittest/TCPLinkTest.cc \ src/qgcunittest/TCPLoopBackServer.cc \ src/qgcunittest/UnitTest.cc \ + src/qgcunittest/UnitTestList.cc \ src/VehicleSetup/SetupViewTest.cc \ } # DebugBuild|WindowsDebugAndRelease } # MobileBuild diff --git a/src/FactSystem/FactSystemTestGeneric.cc b/src/FactSystem/FactSystemTestGeneric.cc index 2bb689402..bd17c673d 100644 --- a/src/FactSystem/FactSystemTestGeneric.cc +++ b/src/FactSystem/FactSystemTestGeneric.cc @@ -27,8 +27,6 @@ #include "FactSystemTestGeneric.h" #include "QGCMAVLink.h" -UT_REGISTER_TEST(FactSystemTestGeneric) - /// FactSystem Unit Test for PX4 autpilot FactSystemTestGeneric::FactSystemTestGeneric(void) { diff --git a/src/FactSystem/FactSystemTestPX4.cc b/src/FactSystem/FactSystemTestPX4.cc index 8a5304940..09a8a561b 100644 --- a/src/FactSystem/FactSystemTestPX4.cc +++ b/src/FactSystem/FactSystemTestPX4.cc @@ -27,8 +27,6 @@ #include "FactSystemTestPX4.h" #include "QGCMAVLink.h" -UT_REGISTER_TEST(FactSystemTestPX4) - /// FactSystem Unit Test for PX4 autpilot FactSystemTestPX4::FactSystemTestPX4(void) { diff --git a/src/MissionItemTest.cc b/src/MissionItemTest.cc index b19582b1a..378d2da29 100644 --- a/src/MissionItemTest.cc +++ b/src/MissionItemTest.cc @@ -24,8 +24,6 @@ #include "MissionItemTest.h" #include "MissionItem.h" -UT_REGISTER_TEST(MissionItemTest) - const MissionItemTest::ItemInfo_t MissionItemTest::_rgItemInfo[] = { { 1, QGeoCoordinate(-10.0, -20.0, -30.0), MAV_CMD_NAV_WAYPOINT, 10.0, 20.0, 30.0, 1.0, true, false, MAV_FRAME_GLOBAL_RELATIVE_ALT }, { 1, QGeoCoordinate(-10.0, -20.0, -30.0), MAV_CMD_NAV_LOITER_UNLIM, 10.0, 20.0, 30.0, 1.0, true, false, MAV_FRAME_GLOBAL_RELATIVE_ALT }, diff --git a/src/MissionManager/MissionControllerTest.cc b/src/MissionManager/MissionControllerTest.cc index 3e8a43a77..ec1d9e115 100644 --- a/src/MissionManager/MissionControllerTest.cc +++ b/src/MissionManager/MissionControllerTest.cc @@ -25,8 +25,6 @@ #include "LinkManager.h" #include "MultiVehicleManager.h" -UT_REGISTER_TEST(MissionControllerTest) - MissionControllerTest::MissionControllerTest(void) : _multiSpyMissionController(NULL) , _multiSpyMissionItem(NULL) diff --git a/src/MissionManager/MissionManagerTest.cc b/src/MissionManager/MissionManagerTest.cc index d3ded1bf1..ec3bbd812 100644 --- a/src/MissionManager/MissionManagerTest.cc +++ b/src/MissionManager/MissionManagerTest.cc @@ -25,9 +25,6 @@ #include "LinkManager.h" #include "MultiVehicleManager.h" -// FIXME: Temporarily disabled until this can be stabilized -//UT_REGISTER_TEST(MissionManagerTest) - const MissionManagerTest::TestCase_t MissionManagerTest::_rgTestCases[] = { { "0\t0\t3\t16\t10\t20\t30\t40\t-10\t-20\t-30\t1\r\n", { 0, QGeoCoordinate(-10.0, -20.0, -30.0), MAV_CMD_NAV_WAYPOINT, 10.0, 20.0, 30.0, 40.0, true, false, MAV_FRAME_GLOBAL_RELATIVE_ALT } }, { "1\t0\t3\t17\t10\t20\t30\t40\t-10\t-20\t-30\t1\r\n", { 1, QGeoCoordinate(-10.0, -20.0, -30.0), MAV_CMD_NAV_LOITER_UNLIM, 10.0, 20.0, 30.0, 40.0, true, false, MAV_FRAME_GLOBAL_RELATIVE_ALT } }, diff --git a/src/VehicleSetup/SetupViewTest.cc b/src/VehicleSetup/SetupViewTest.cc index 3ab4c6f65..d7fa322a8 100644 --- a/src/VehicleSetup/SetupViewTest.cc +++ b/src/VehicleSetup/SetupViewTest.cc @@ -29,8 +29,6 @@ #include "QGCMessageBox.h" #include "MultiVehicleManager.h" -UT_REGISTER_TEST(SetupViewTest) - void SetupViewTest::_clickThrough_test(void) { _connectMockLink(); diff --git a/src/qgcunittest/FileDialogTest.cc b/src/qgcunittest/FileDialogTest.cc index d98d0eabe..d2a843da5 100644 --- a/src/qgcunittest/FileDialogTest.cc +++ b/src/qgcunittest/FileDialogTest.cc @@ -29,8 +29,6 @@ #include "FileDialogTest.h" #include "QGCFileDialog.h" -UT_REGISTER_TEST(FileDialogTest) - FileDialogTest::FileDialogTest(void) { diff --git a/src/qgcunittest/FileManagerTest.cc b/src/qgcunittest/FileManagerTest.cc index 54eae9353..d7a94d7b8 100644 --- a/src/qgcunittest/FileManagerTest.cc +++ b/src/qgcunittest/FileManagerTest.cc @@ -29,8 +29,6 @@ #include "UAS.h" #include "QGCApplication.h" -//UT_REGISTER_TEST(FileManagerTest) - FileManagerTest::FileManagerTest(void) : _fileServer(NULL) , _fileManager(NULL) diff --git a/src/qgcunittest/FlightGearTest.cc b/src/qgcunittest/FlightGearTest.cc index da6cdc3fa..7fd12a13d 100644 --- a/src/qgcunittest/FlightGearTest.cc +++ b/src/qgcunittest/FlightGearTest.cc @@ -29,8 +29,6 @@ /// /// @author Don Gagne -UT_REGISTER_TEST(FlightGearUnitTest) - FlightGearUnitTest::FlightGearUnitTest(void) { diff --git a/src/qgcunittest/GeoTest.cc b/src/qgcunittest/GeoTest.cc index 4ae24b516..c24dd69c9 100644 --- a/src/qgcunittest/GeoTest.cc +++ b/src/qgcunittest/GeoTest.cc @@ -29,8 +29,6 @@ #include "GeoTest.h" #include "QGCGeo.h" -UT_REGISTER_TEST(GeoTest) - /* GeoTest::GeoTest(void) { diff --git a/src/qgcunittest/LinkManagerTest.cc b/src/qgcunittest/LinkManagerTest.cc index 3c522c35a..114dab777 100644 --- a/src/qgcunittest/LinkManagerTest.cc +++ b/src/qgcunittest/LinkManagerTest.cc @@ -30,8 +30,6 @@ #include "MockLink.h" #include "QGCApplication.h" -UT_REGISTER_TEST(LinkManagerTest) - LinkManagerTest::LinkManagerTest(void) : _linkMgr(NULL), _multiSpy(NULL) diff --git a/src/qgcunittest/MainWindowTest.cc b/src/qgcunittest/MainWindowTest.cc index c360c84da..da6453872 100644 --- a/src/qgcunittest/MainWindowTest.cc +++ b/src/qgcunittest/MainWindowTest.cc @@ -31,9 +31,6 @@ #include "QGCMessageBox.h" #include "MultiVehicleManager.h" -// FIXME: Temporarily turned off -//UT_REGISTER_TEST(MainWindowTest) - void MainWindowTest::_connectWindowClose_test(MAV_AUTOPILOT autopilot) { _createMainWindow(); diff --git a/src/qgcunittest/MavlinkLogTest.cc b/src/qgcunittest/MavlinkLogTest.cc index 766cb9e1e..310a4adcf 100644 --- a/src/qgcunittest/MavlinkLogTest.cc +++ b/src/qgcunittest/MavlinkLogTest.cc @@ -34,9 +34,6 @@ #include "UAS.h" #include "MultiVehicleManager.h" -// FIXME: Temporarily disabled until this can be stabilized -//UT_REGISTER_TEST(MavlinkLogTest) - const char* MavlinkLogTest::_tempLogFileTemplate = "FlightDataXXXXXX"; ///< Template for temporary log file const char* MavlinkLogTest::_logFileExtension = "mavlink"; ///< Extension for log files const char* MavlinkLogTest::_saveLogFilename = "qgroundcontrol.mavlink.ut"; ///< Filename to save log files to diff --git a/src/qgcunittest/MessageBoxTest.cc b/src/qgcunittest/MessageBoxTest.cc index 72cf44bfc..ff03bc1a5 100644 --- a/src/qgcunittest/MessageBoxTest.cc +++ b/src/qgcunittest/MessageBoxTest.cc @@ -29,8 +29,6 @@ #include "MessageBoxTest.h" #include "QGCMessageBox.h" -UT_REGISTER_TEST(MessageBoxTest) - MessageBoxTest::MessageBoxTest(void) { diff --git a/src/qgcunittest/PX4RCCalibrationTest.cc b/src/qgcunittest/PX4RCCalibrationTest.cc index 3aec7f622..04091421c 100644 --- a/src/qgcunittest/PX4RCCalibrationTest.cc +++ b/src/qgcunittest/PX4RCCalibrationTest.cc @@ -31,7 +31,6 @@ /// /// @author Don Gagne -UT_REGISTER_TEST(RadioConfigTest) QGC_LOGGING_CATEGORY(RadioConfigTestLog, "RadioConfigTestLog") // This will check for the wizard buttons being enabled of disabled according to the mask you pass in. diff --git a/src/qgcunittest/TCPLinkTest.cc b/src/qgcunittest/TCPLinkTest.cc index 2ebd3b8bb..7d2c99f68 100644 --- a/src/qgcunittest/TCPLinkTest.cc +++ b/src/qgcunittest/TCPLinkTest.cc @@ -29,10 +29,6 @@ /// /// @author Don Gagne -// This unit test has gotten too flaky to run reliably under TeamCity. Removing for now till there is -// time to debug. -//UT_REGISTER_TEST(TCPLinkUnitTest) - TCPLinkUnitTest::TCPLinkUnitTest(void) : _config(NULL) , _link(NULL) diff --git a/src/qgcunittest/UnitTest.h b/src/qgcunittest/UnitTest.h index a05855b17..5326872e4 100644 --- a/src/qgcunittest/UnitTest.h +++ b/src/qgcunittest/UnitTest.h @@ -38,7 +38,7 @@ #include "QGCMAVLink.h" #include "LinkInterface.h" -#define UT_REGISTER_TEST(className) static UnitTestWrapper t(#className); +#define UT_REGISTER_TEST(className) static UnitTestWrapper className(#className); class QGCMessageBox; class QGCFileDialog; diff --git a/src/qgcunittest/UnitTestList.cc b/src/qgcunittest/UnitTestList.cc new file mode 100644 index 000000000..6a71c97e7 --- /dev/null +++ b/src/qgcunittest/UnitTestList.cc @@ -0,0 +1,70 @@ +/*===================================================================== + + QGroundControl Open Source Ground Control Station + + (c) 2009 - 2014 QGROUNDCONTROL PROJECT + + This file is part of the QGROUNDCONTROL project + + QGROUNDCONTROL is free software: you can redistribute it and/or modify + it under the terms of the GNU General Public License as published by + the Free Software Foundation, either version 3 of the License, or + (at your option) any later version. + + QGROUNDCONTROL is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + GNU General Public License for more details. + + You should have received a copy of the GNU General Public License + along with QGROUNDCONTROL. If not, see . + + ======================================================================*/ + +// We keep the list of all unit tests in a global location so it's easier to see which +// ones are enabled/disabled + +#include "FactSystemTestGeneric.h" +#include "FactSystemTestPX4.h" +#include "FileDialogTest.h" +#include "FlightGearTest.h" +#include "GeoTest.h" +#include "LinkManagerTest.h" +#include "MessageBoxTest.h" +#include "MissionItemTest.h" +#include "MissionControllerTest.h" +#include "PX4RCCalibrationTest.h" +#include "SetupViewTest.h" +#include "MavlinkLogTest.h" + +UT_REGISTER_TEST(FactSystemTestGeneric) +UT_REGISTER_TEST(FactSystemTestPX4) +UT_REGISTER_TEST(FileDialogTest) +UT_REGISTER_TEST(FlightGearUnitTest) +UT_REGISTER_TEST(GeoTest) +UT_REGISTER_TEST(LinkManagerTest) +UT_REGISTER_TEST(MavlinkLogTest) +UT_REGISTER_TEST(MessageBoxTest) +UT_REGISTER_TEST(MissionItemTest) +UT_REGISTER_TEST(MissionControllerTest) +UT_REGISTER_TEST(RadioConfigTest) +UT_REGISTER_TEST(SetupViewTest) + +// List of unit test which are currently disabled. +// If disabling a new test, include reason in comment. + +// Why is this one off? +//UT_REGISTER_TEST(FileManagerTest) + +// FIXME: Temporarily disabled until this can be stabilized +//UT_REGISTER_TEST(MainWindowTest) + +// FIXME: Temporarily disabled until this can be stabilized + +// FIXME: Temporarily disabled until this can be stabilized +//UT_REGISTER_TEST(MissionManagerTest) + +// This unit test has gotten too flaky to run reliably under TeamCity. Removing for now till there is +// time to debug. +//UT_REGISTER_TEST(TCPLinkUnitTest) + -- 2.22.0