lisonwu/qgroundcontrol
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Test: Fix running tests under cmake

Browse Source
This commit is contained in:
Holden
2024-05-08 21:27:53 -04:00
committed by Holden
parent 35f8864889
commit 8f6f4c6b0c
34 changed files with 268 additions and 166 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/main.cc
+2 -18
View File
@@ -22,7 +22,7 @@
#endif
#ifdef UNITTEST_BUILD
#include "UnitTest.h"
#include "UnitTestList.h"
#endif
#ifdef QT_DEBUG
@@ -237,26 +237,10 @@ int main(int argc, char *argv[])
#ifdef UNITTEST_BUILD
if (runUnitTests) {
for (int i=0; i < (stressUnitTests ? 20 : 1); i++) {
if (!app->_initForUnitTests()) {
return -1;
}
// Run the test
int failures = UnitTest::run(unitTestOptions);
if (failures == 0) {
qDebug() << "ALL TESTS PASSED";
exitCode = 0;
} else {
qDebug() << failures << " TESTS FAILED!";
exitCode = -failures;
break;
}
}
exitCode = runTests(stressUnitTests, unitTestOptions);
} else
#endif
{
#ifdef Q_OS_ANDROID
AndroidInterface::checkStoragePermissions();
QNativeInterface::QAndroidApplication::hideSplashScreen(333);
test/AnalyzeView/CMakeLists.txt
+9 -3
View File
@@ -4,12 +4,18 @@ qt_add_library(AnalyzeViewTest
STATIC
LogDownloadTest.cc
LogDownloadTest.h
MavlinkLogTest.cc
MavlinkLogTest.h
)
target_link_libraries(AnalyzeViewTest
PRIVATE
Qt6::Core
AnalyzeView
PRIVATE
Qt6::Core
AnalyzeView
MAVLink
QGC
Utilities
Vehicle
PUBLIC
qgcunittest
)
test/qgcunittest/MavlinkLogTest.cc → test/AnalyzeView/MavlinkLogTest.cc
View File
test/qgcunittest/MavlinkLogTest.h → test/AnalyzeView/MavlinkLogTest.h
View File
test/AutoPilotPlugins/CMakeLists.txt
+22
View File
@@ -0,0 +1,22 @@
find_package(Qt6 REQUIRED COMPONENTS Core Positioning Test Widgets)
qt_add_library(AutoPilotPluginsTest
STATIC
RadioConfigTest.cc
RadioConfigTest.h
)
target_link_libraries(AutoPilotPluginsTest
PRIVATE
APMAutoPilotPlugin
AutoPilotPlugins
PX4AutoPilotPlugin
QGC
Vehicle
PUBLIC
Qt6::Core
CommonAutoPilotPlugin
qgcunittest
)
target_include_directories(AutoPilotPluginsTest PUBLIC ${CMAKE_CURRENT_SOURCE_DIR})
test/qgcunittest/RadioConfigTest.cc → test/AutoPilotPlugins/RadioConfigTest.cc
-1
View File
@@ -16,7 +16,6 @@
#include "APM/APMAutoPilotPlugin.h"
#include "APM/APMRadioComponent.h"
#include "PX4RadioComponent.h"
#include "QGCQmlWidgetHolder.h"
#include "AutoPilotPlugin.h"
#include "MultiSignalSpy.h"
test/qgcunittest/RadioConfigTest.h → test/AutoPilotPlugins/RadioConfigTest.h
+1
View File
@@ -11,6 +11,7 @@
#pragma once
#include "UnitTest.h"
#include "RadioComponentController.h"
#include <QtCore/QLoggingCategory>
test/CMakeLists.txt
+29 -17
View File
@@ -2,18 +2,11 @@ if(NOT QGC_BUILD_TESTING)
return()
endif()
find_package(Qt6 REQUIRED COMPONENTS Core Test)
include(CTest)
enable_testing()
# set(UNIT_TESTING_RESOURCES)
# qt_add_resources(UNIT_TESTING_RESOURCES UnitTest.qrc)
qt_add_library(qgctest
STATIC
UnitTestList.cc
# ${UNIT_TESTING_RESOURCES}
)
add_custom_target(check
COMMAND ctest --output-on-failure .
USES_TERMINAL
@@ -29,14 +22,15 @@ endfunction()
add_subdirectory(AnalyzeView)
# add_qgc_test(LogDownloadTest)
# add_qgc_test(MavlinkLogTest)
add_subdirectory(Audio)
add_qgc_test(AudioOutputTest)
add_subdirectory(Comms)
# add_subdirectory(AutoPilotPlugins)
# add_qgc_test(RadioConfigTest)
add_subdirectory(Compression)
add_qgc_test(DecompressionTest)
add_subdirectory(Comms)
add_subdirectory(FactSystem)
add_qgc_test(FactSystemTestGeneric)
@@ -47,7 +41,6 @@ add_subdirectory(Geo)
add_qgc_test(GeoTest)
add_subdirectory(MAVLink)
add_qgc_test(MAVLinkTest)
add_subdirectory(MissionManager)
add_qgc_test(CameraCalcTest)
@@ -74,13 +67,9 @@ add_qgc_test(TransectStyleComplexItemTest)
# add_qgc_test(VisualMissionItemTest)
add_subdirectory(qgcunittest)
add_qgc_test(ComponentInformationCacheTest)
add_qgc_test(ComponentInformationTranslationTest)
# add_qgc_test(FileDialogTest)
# add_qgc_test(MainWindowTest)
# add_qgc_test(MavlinkLogTest)
# add_qgc_test(MessageBoxTest)
# add_qgc_test(RadioConfigTest)
add_subdirectory(QmlControls)
@@ -89,7 +78,14 @@ add_qgc_test(TerrainQueryTest)
add_subdirectory(UI)
add_subdirectory(Utilities)
# Compression
add_qgc_test(DecompressionTest)
add_subdirectory(Vehicle)
# Components
add_qgc_test(ComponentInformationCacheTest)
add_qgc_test(ComponentInformationTranslationTest)
add_qgc_test(FTPManagerTest)
# add_qgc_test(InitialConnectTest)
# add_qgc_test(RequestMessageTest)
@@ -101,6 +97,15 @@ add_qgc_test(FTPManagerTest)
# add_qgc_test(SendMavCommandTest)
# add_qgc_test(TCPLinkTest)
# set(UNIT_TESTING_RESOURCES)
# qt_add_resources(UNIT_TESTING_RESOURCES UnitTest.qrc)
qt_add_library(qgctest
STATIC
UnitTestList.cc
UnitTestList.h
# ${UNIT_TESTING_RESOURCES}
)
target_link_libraries(qgctest
PRIVATE
AnalyzeViewTest
@@ -115,6 +120,13 @@ target_link_libraries(qgctest
TerrainTest
UITest
VehicleTest
VehicleComponentsTest
QGC
Utilities
UtilitiesTest
PUBLIC
Qt6::Core
qgcunittest
)
target_include_directories(qgctest INTERFACE ${CMAKE_CURRENT_SOURCE_DIR})
test/Geo/GeoTest.cc
+19 -19
View File
@@ -22,11 +22,11 @@ void GeoTest::_convertGeoToNed_test(void)
{
const QGeoCoordinate coord(47.364869, 8.594398, 0.0);
const double expectedX = -1281.152128182419801305514;
const double expectedY = 3486.949719522415307437768;
const double expectedZ = 0;
const double expectedX = -1282.58731618;
const double expectedY = 3490.85591324;
const double expectedZ = 0.;
double x, y, z;
double x = 0., y = 0., z = 0.;
QGCGeo::convertGeoToNed(coord, m_origin, x, y, z);
QCOMPARE(x, expectedX);
@@ -37,13 +37,13 @@ void GeoTest::_convertGeoToNed_test(void)
void GeoTest::_convertGeoToNedAtOrigin_test(void)
{
QGeoCoordinate coord(m_origin);
coord.setAltitude(10.0); // offset altitude to test z
coord.setAltitude(10.); // offset altitude to test z
const double expectedX = 0.0;
const double expectedY = 0.0;
const double expectedZ = -10.0;
const double expectedX = 0.;
const double expectedY = 0.;
const double expectedZ = -10.;
double x, y, z;
double x = 0., y = 0., z = 0.;
QGCGeo::convertGeoToNed(coord, m_origin, x, y, z);
QCOMPARE(x, expectedX);
@@ -53,11 +53,11 @@ void GeoTest::_convertGeoToNedAtOrigin_test(void)
void GeoTest::_convertNedToGeo_test(void)
{
const double x = -1281.152128182419801305514;
const double y = 3486.949719522415307437768;
const double x = -1282.58731618;
const double y = 3490.85591324;
const double z = 0;
QGeoCoordinate coord;
QGeoCoordinate coord(0,0,0);
QGCGeo::convertNedToGeo(x, y, z, m_origin, coord);
QVERIFY(coord.isValid());
@@ -72,7 +72,7 @@ void GeoTest::_convertNedToGeoAtOrigin_test(void)
const double y = 0.0;
const double z = 0.0;
QGeoCoordinate coord;
QGeoCoordinate coord(0,0,0);
QGCGeo::convertNedToGeo(x, y, z, m_origin, coord);
QVERIFY(coord.isValid());
@@ -84,22 +84,22 @@ void GeoTest::_convertNedToGeoAtOrigin_test(void)
void GeoTest::_convertGeoToUTM_test(void) {
const QGeoCoordinate coord(m_origin);
double easting;
double northing;
double easting = 0.;
double northing = 0.;
const int zone = QGCGeo::convertGeoToUTM(coord, easting, northing);
QCOMPARE(zone, 32);
QCOMPARE(easting, 465886.09);
QCOMPARE(easting, 465886.092246);
QCOMPARE(northing, 5247092.45);
}
void GeoTest::_convertUTMToGeo_test(void) {
const double easting = 465886.09;
const double easting = 465886.092246;
const double northing = 5247092.45;
const int zone = 32;
const bool southhemi = false;
QGeoCoordinate coord;
QGeoCoordinate coord(0,0,0);
const bool result = QGCGeo::convertUTMToGeo(easting, northing, zone, southhemi, coord);
QVERIFY(result);
@@ -120,7 +120,7 @@ void GeoTest::_convertGeoToMGRS_test(void) {
void GeoTest::_convertMGRSToGeo_test(void) {
const QString mgrs("32T MT 65886 47092");
QGeoCoordinate coord;
QGeoCoordinate coord(0,0,0);
const bool result = QGCGeo::convertMGRSToGeo(mgrs, coord);
QVERIFY(result);
test/MissionManager/TransectStyleComplexItemTest.cc
+3 -2
View File
@@ -210,7 +210,8 @@ void TransectStyleComplexItemTest::_testAltitudes(void)
}
}
void TransectStyleComplexItemTest::_testFollowTerrain(void)
// TODO: Move To Terrain Testing
/*void TransectStyleComplexItemTest::_testFollowTerrain(void)
{
_transectStyleItem->cameraCalc()->distanceToSurface()->setRawValue(50);
_transectStyleItem->cameraCalc()->adjustedFootprintFrontal()->setRawValue(0);
@@ -229,7 +230,7 @@ void TransectStyleComplexItemTest::_testFollowTerrain(void)
QCOMPARE(missionItem->param7(), expectedTerrainValues.front());
expectedTerrainValues.pop_front();
}
}
}*/
TestTransectStyleItem::TestTransectStyleItem(PlanMasterController* masterController)
: TransectStyleComplexItem (masterController, false /* flyView */, QStringLiteral("UnitTestTransect"))
test/MissionManager/TransectStyleComplexItemTest.h
+1 -1
View File
@@ -34,7 +34,7 @@ private slots:
void _testRebuildTransects (void);
void _testDistanceSignalling(void);
void _testAltitudes (void);
void _testFollowTerrain (void);
// void _testFollowTerrain (void);
private:
MultiSignalSpyV2* _multiSpy = nullptr;
test/QGCTest.pri
+12 -11
View File
@@ -18,8 +18,8 @@ ReleaseBuild {
INCLUDEPATH += \
$$PWD/AnalyzeView \
$$PWD/Audio \
$$PWD/AutoPilotPlugins \
$$PWD/Comms \
$$PWD/Compression \
$$PWD/FactSystem \
$$PWD/Geo \
$$PWD/MAVLink \
@@ -28,12 +28,13 @@ ReleaseBuild {
$$PWD/QmlControls \
$$PWD/Terrain \
$$PWD/UI \
$$PWD/Utilities/Compression \
$$PWD/Vehicle
HEADERS += \
#$$PWD/AnalyzeView/LogDownloadTest.h \
$$PWD/Audio/AudioOutputTest.h \
$$PWD/Compression/DecompressionTest.h \
$$PWD/Utilities/Compression/DecompressionTest.h \
$$PWD/FactSystem/FactSystemTestBase.h \
$$PWD/FactSystem/FactSystemTestGeneric.h \
$$PWD/FactSystem/FactSystemTestPX4.h \
@@ -65,10 +66,10 @@ ReleaseBuild {
#$$PWD/qgcunittest/FileDialogTest.h \
#$$PWD/qgcunittest/MainWindowTest.h \
#$$PWD/qgcunittest/MessageBoxTest.h \
#$$PWD/qgcunittest/RadioConfigTest.h \
$$PWD/qgcunittest/ComponentInformationCacheTest.h \
$$PWD/qgcunittest/ComponentInformationTranslationTest.h \
$$PWD/qgcunittest/MavlinkLogTest.h \
#$$PWD/AutoPilotPlugins/RadioConfigTest.h \
$$PWD/Vehicle/Components/ComponentInformationCacheTest.h \
$$PWD/Vehicle/Components/ComponentInformationTranslationTest.h \
$$PWD/AnalyzeView/MavlinkLogTest.h \
$$PWD/qgcunittest/MultiSignalSpy.h \
$$PWD/qgcunittest/MultiSignalSpyV2.h \
$$PWD/qgcunittest/UnitTest.h \
@@ -83,7 +84,7 @@ ReleaseBuild {
SOURCES += \
#$$PWD/AnalyzeView/LogDownloadTest.cc \
$$PWD/Audio/AudioOutputTest.cc \
$$PWD/Compression/DecompressionTest.cc \
$$PWD/Utilities/Compression/DecompressionTest.cc \
$$PWD/FactSystem/FactSystemTestBase.cc \
$$PWD/FactSystem/FactSystemTestGeneric.cc \
$$PWD/FactSystem/FactSystemTestPX4.cc \
@@ -115,10 +116,10 @@ ReleaseBuild {
#$$PWD/qgcunittest/FileDialogTest.cc \
#$$PWD/qgcunittest/MainWindowTest.cc \
#$$PWD/qgcunittest/MessageBoxTest.cc \
#$$PWD/qgcunittest/RadioConfigTest.cc \
$$PWD/qgcunittest/ComponentInformationCacheTest.cc \
$$PWD/qgcunittest/ComponentInformationTranslationTest.cc \
$$PWD/qgcunittest/MavlinkLogTest.cc \
#$$PWD/AutoPilotPlugins/RadioConfigTest.cc \
$$PWD/Vehicle/Components/ComponentInformationCacheTest.cc \
$$PWD/Vehicle/Components/ComponentInformationTranslationTest.cc \
$$PWD/AnalyzeView/MavlinkLogTest.cc \
$$PWD/qgcunittest/MultiSignalSpy.cc \
$$PWD/qgcunittest/MultiSignalSpyV2.cc \
$$PWD/qgcunittest/UnitTest.cc \
test/UnitTest.qrc
+2 -2
View File
@@ -14,8 +14,8 @@
<file alias="PolygonGood.kml">MissionManager/PolygonGood.kml</file>
<file alias="PolygonMissingNode.kml">MissionManager/PolygonMissingNode.kml</file>
<file alias="SectionTest.plan">MissionManager/SectionTest.plan</file>
<file alias="TranslationTest.json">qgcunittest/TranslationTest.json</file>
<file alias="TranslationTest_de_DE.ts">qgcunittest/TranslationTest_de_DE.ts</file>
<file alias="TranslationTest.json">Vehicle/Components/TranslationTest.json</file>
<file alias="TranslationTest_de_DE.ts">Vehicle/Components/TranslationTest_de_DE.ts</file>
<file alias="FactSystemTest.qml">FactSystem/FactSystemTest.qml</file>
<file alias="MissionPlanner.waypoints">MissionManager/MissionPlanner.waypoints</file>
<file alias="MockLinkOptionsDlg.qml">Comms/MockLinkOptionsDlg.qml</file>
test/UnitTestList.cc
+104 -64
View File
@@ -7,17 +7,22 @@
*
****************************************************************************/
#include "UnitTestList.h"
#include "UnitTest.h"
#include "QGCApplication.h"
#include "QGCLoggingCategory.h"
// AnalyzeView
// #include "MavlinkLogTest.h"
// #include "LogDownloadTest.h"
// Audio
#include "AudioOutputTest.h"
// comm
// AutoPilotPlugins
// #include "RadioConfigTest.h"
// Compression
#include "DecompressionTest.h"
// Comms
// FactSystem
#include "FactSystemTestGeneric.h"
@@ -56,9 +61,7 @@
#include "ComponentInformationTranslationTest.h"
// #include "FileDialogTest.h"
// #include "MainWindowTest.h"
// #include "MavlinkLogTest.h"
// #include "MessageBoxTest.h"
// #include "RadioConfigTest.h"
// QmlControls
@@ -67,7 +70,14 @@
// UI
// Utilities
// Compression
#include "DecompressionTest.h"
// Vehicle
// Components
#include "ComponentInformationCacheTest.h"
#include "ComponentInformationTranslationTest.h"
#include "FTPManagerTest.h"
// #include "InitialConnectTest.h"
// #include "RequestMessageTest.h"
@@ -80,75 +90,105 @@
// #include "SendMavCommandTest.h"
// #include "TCPLinkTest.h"
QGC_LOGGING_CATEGORY(UnitTestsLog, "qgc.test.unittestlist")
// AnalyzeView
// UT_REGISTER_TEST(LogDownloadTest)
int runTests(bool stress, QStringView unitTestOptions)
{
// AnalyzeView
// UT_REGISTER_TEST(MavlinkLogTest)
// UT_REGISTER_TEST(LogDownloadTest)
// Audio
UT_REGISTER_TEST(AudioOutputTest)
// Audio
UT_REGISTER_TEST(AudioOutputTest)
// comm
// AutoPilotPlugins
// UT_REGISTER_TEST(RadioConfigTest)
// Compression
UT_REGISTER_TEST(DecompressionTest)
// Comms
// FactSystem
UT_REGISTER_TEST(FactSystemTestGeneric)
UT_REGISTER_TEST(FactSystemTestPX4)
UT_REGISTER_TEST(ParameterManagerTest)
// FactSystem
UT_REGISTER_TEST(FactSystemTestGeneric)
UT_REGISTER_TEST(FactSystemTestPX4)
UT_REGISTER_TEST(ParameterManagerTest)
// Geo
UT_REGISTER_TEST(GeoTest)
// Geo
// UT_REGISTER_TEST(GeoTest)
// MissionManager
UT_REGISTER_TEST(CameraCalcTest)
UT_REGISTER_TEST(CameraSectionTest)
UT_REGISTER_TEST(CorridorScanComplexItemTest)
// UT_REGISTER_TEST(FWLandingPatternTest)
// UT_REGISTER_TEST(LandingComplexItemTest)
// UT_REGISTER_TEST_STANDALONE(MissionCommandTreeEditorTest)
UT_REGISTER_TEST(MissionCommandTreeTest)
UT_REGISTER_TEST(MissionControllerManagerTest)
UT_REGISTER_TEST(MissionControllerTest)
UT_REGISTER_TEST(MissionItemTest)
UT_REGISTER_TEST(MissionManagerTest)
UT_REGISTER_TEST(MissionSettingsTest)
UT_REGISTER_TEST(PlanMasterControllerTest)
UT_REGISTER_TEST(QGCMapPolygonTest)
UT_REGISTER_TEST(QGCMapPolylineTest)
// UT_REGISTER_TEST(SectionTest)
UT_REGISTER_TEST(SimpleMissionItemTest)
UT_REGISTER_TEST(SpeedSectionTest)
UT_REGISTER_TEST(StructureScanComplexItemTest)
UT_REGISTER_TEST(SurveyComplexItemTest)
UT_REGISTER_TEST(TransectStyleComplexItemTest)
// UT_REGISTER_TEST(VisualMissionItemTest)
// MissionManager
UT_REGISTER_TEST(CameraCalcTest)
UT_REGISTER_TEST(CameraSectionTest)
UT_REGISTER_TEST(CorridorScanComplexItemTest)
// UT_REGISTER_TEST(FWLandingPatternTest)
// UT_REGISTER_TEST(LandingComplexItemTest)
// UT_REGISTER_TEST_STANDALONE(MissionCommandTreeEditorTest)
UT_REGISTER_TEST(MissionCommandTreeTest)
UT_REGISTER_TEST(MissionControllerManagerTest)
UT_REGISTER_TEST(MissionControllerTest)
UT_REGISTER_TEST(MissionItemTest)
UT_REGISTER_TEST(MissionManagerTest)
UT_REGISTER_TEST(MissionSettingsTest)
UT_REGISTER_TEST(PlanMasterControllerTest)
UT_REGISTER_TEST(QGCMapPolygonTest)
UT_REGISTER_TEST(QGCMapPolylineTest)
// UT_REGISTER_TEST(SectionTest)
UT_REGISTER_TEST(SimpleMissionItemTest)
UT_REGISTER_TEST(SpeedSectionTest)
UT_REGISTER_TEST(StructureScanComplexItemTest)
UT_REGISTER_TEST(SurveyComplexItemTest)
UT_REGISTER_TEST(TransectStyleComplexItemTest)
// UT_REGISTER_TEST(VisualMissionItemTest)
// qgcunittest
UT_REGISTER_TEST(ComponentInformationCacheTest)
UT_REGISTER_TEST(ComponentInformationTranslationTest)
// UT_REGISTER_TEST(FileDialogTest)
// UT_REGISTER_TEST(MainWindowTest)
// UT_REGISTER_TEST(MavlinkLogTest)
// UT_REGISTER_TEST(MessageBoxTest)
// UT_REGISTER_TEST(RadioConfigTest)
// qgcunittest
// UT_REGISTER_TEST(FileDialogTest)
// UT_REGISTER_TEST(MainWindowTest)
// UT_REGISTER_TEST(MessageBoxTest)
// QmlControls
// QmlControls
// Terrain
// UT_REGISTER_TEST(TerrainQueryTest)
// Terrain
// UT_REGISTER_TEST(TerrainQueryTest)
// UI
// UI
// Vehicle
UT_REGISTER_TEST(FTPManagerTest)
// UT_REGISTER_TEST(InitialConnectTest)
// UT_REGISTER_TEST(RequestMessageTest)
// UT_REGISTER_TEST(SendMavCommandWithHandlerTest)
// UT_REGISTER_TEST(SendMavCommandWithSignalingTest)
// Utilities
// Compression
UT_REGISTER_TEST(DecompressionTest)
// Missing
// UT_REGISTER_TEST(FlightGearUnitTest)
// UT_REGISTER_TEST(LinkManagerTest)
// UT_REGISTER_TEST(SendMavCommandTest)
// UT_REGISTER_TEST(TCPLinkTest)
// Vehicle
// Components
UT_REGISTER_TEST(ComponentInformationCacheTest)
UT_REGISTER_TEST(ComponentInformationTranslationTest)
UT_REGISTER_TEST(FTPManagerTest)
// UT_REGISTER_TEST(InitialConnectTest)
// UT_REGISTER_TEST(RequestMessageTest)
// UT_REGISTER_TEST(SendMavCommandWithHandlerTest)
// UT_REGISTER_TEST(SendMavCommandWithSignalingTest)
// Missing
// UT_REGISTER_TEST(FlightGearUnitTest)
// UT_REGISTER_TEST(LinkManagerTest)
// UT_REGISTER_TEST(SendMavCommandTest)
// UT_REGISTER_TEST(TCPLinkTest)
int result = 0;
for (int i=0; i < (stress ? 20 : 1); i++) {
if (!qgcApp()->_initForUnitTests()) {
result = -1;
break;
}
// Run the test
const int failures = UnitTest::run(unitTestOptions);
if (failures == 0) {
qDebug() << "ALL TESTS PASSED";
result = 0;
} else {
qDebug() << failures << " TESTS FAILED!";
result = -failures;
break;
}
}
return result;
}
test/UnitTestList.h
+7
View File
@@ -0,0 +1,7 @@
#pragma once
#include <QtCore/QLoggingCategory>
Q_DECLARE_LOGGING_CATEGORY(UnitTestsLog)
int runTests(bool stress, QStringView unitTestOptions);
test/Utilities/CMakeLists.txt
+16
View File
@@ -0,0 +1,16 @@
add_subdirectory(Compression)
find_package(Qt6 REQUIRED COMPONENTS Core)
qt_add_library(UtilitiesTest STATIC
)
target_link_libraries(UtilitiesTest
PRIVATE
Qt6::Test
Utilities
PUBLIC
qgcunittest
)
target_include_directories(UtilitiesTest PUBLIC ${CMAKE_CURRENT_SOURCE_DIR})
test/Compression/.gitignore → test/Utilities/Compression/.gitignore
View File
test/Compression/CMakeLists.txt → test/Utilities/Compression/CMakeLists.txt
View File
test/Compression/DecompressionTest.cc → test/Utilities/Compression/DecompressionTest.cc
+2 -2
View File
@@ -11,7 +11,7 @@ DecompressionTest::DecompressionTest()
void DecompressionTest::_testDecompressGzip()
{
const QString gzippedFileName = QStringLiteral("manifest.json.gz");
const QString gzippedFileName = QStringLiteral(":/manifest.json.gz");
const QString decompressedFilename = QStringLiteral("manifest.json");
const bool result = QGCZlib::inflateGzipFile(gzippedFileName, decompressedFilename);
QVERIFY(result);
@@ -19,7 +19,7 @@ void DecompressionTest::_testDecompressGzip()
void DecompressionTest::_testDecompressLZMA()
{
const QString lzmaFilename = QStringLiteral("manifest.json.xz");
const QString lzmaFilename = QStringLiteral(":/manifest.json.xz");
const QString decompressedFilename = QStringLiteral("manifest.json");
const bool result = QGCLZMA::inflateLZMAFile(lzmaFilename, decompressedFilename);
QVERIFY(result);
test/Compression/DecompressionTest.h → test/Utilities/Compression/DecompressionTest.h
View File
test/Compression/manifest.json.gz → test/Utilities/Compression/manifest.json.gz
View File
test/Compression/manifest.json.xz → test/Utilities/Compression/manifest.json.xz
View File
test/Vehicle/CMakeLists.txt
+4
View File
@@ -1,3 +1,5 @@
add_subdirectory(Components)
find_package(Qt6 REQUIRED COMPONENTS Core Test)
qt_add_library(VehicleTest
@@ -22,6 +24,8 @@ target_link_libraries(VehicleTest
Comms
qgcunittest
Vehicle
INTERFACE
VehicleComponentsTest
)
target_include_directories(VehicleTest PUBLIC ${CMAKE_CURRENT_SOURCE_DIR})
test/Vehicle/Components/CMakeLists.txt
+28
View File
@@ -0,0 +1,28 @@
find_package(Qt6 REQUIRED COMPONENTS Core Test)
qt_add_library(VehicleComponentsTest
STATIC
ComponentInformationCacheTest.cc
ComponentInformationCacheTest.h
ComponentInformationTranslationTest.cc
ComponentInformationTranslationTest.h
)
target_link_libraries(VehicleComponentsTest
PRIVATE
Qt6::Test
Utilities
VehicleComponents
PUBLIC
Qt6::Core
qgcunittest
)
qt_add_resources(VehicleComponentsTest
"VehicleComponentsTest_res"
FILES
TranslationTest.json
TranslationTest_de_DE.ts
)
target_include_directories(VehicleComponentsTest PUBLIC ${CMAKE_CURRENT_SOURCE_DIR})
test/qgcunittest/ComponentInformationCacheTest.cc → test/Vehicle/Components/ComponentInformationCacheTest.cc
View File
test/qgcunittest/ComponentInformationCacheTest.h → test/Vehicle/Components/ComponentInformationCacheTest.h
View File
test/qgcunittest/ComponentInformationTranslationTest.cc → test/Vehicle/Components/ComponentInformationTranslationTest.cc
View File
test/qgcunittest/ComponentInformationTranslationTest.h → test/Vehicle/Components/ComponentInformationTranslationTest.h
View File
test/qgcunittest/TranslationTest.json → test/Vehicle/Components/TranslationTest.json
View File
test/qgcunittest/TranslationTest_de_DE.ts → test/Vehicle/Components/TranslationTest_de_DE.ts
View File
test/qgcunittest/CMakeLists.txt
+3 -19
View File
@@ -4,30 +4,22 @@ qt_add_library(qgcunittest
STATIC
# FileDialogTest.cc
# FileDialogTest.h
ComponentInformationCacheTest.cc
ComponentInformationCacheTest.h
ComponentInformationTranslationTest.cc
ComponentInformationTranslationTest.h
# MainWindowTest.cc
# MainWindowTest.h
MavlinkLogTest.cc
MavlinkLogTest.h
# MessageBoxTest.cc
# MessageBoxTest.h
MultiSignalSpy.cc
MultiSignalSpy.h
MultiSignalSpyV2.cc
MultiSignalSpyV2.h
# RadioConfigTest.cc
# RadioConfigTest.h
UnitTest.cc
UnitTest.h
)
target_link_libraries(qgcunittest
PRIVATE
Qt6::Test
FactSystem
MissionManager
QGC
Settings
Vehicle
@@ -35,18 +27,10 @@ target_link_libraries(qgcunittest
PUBLIC
Qt6::Core
Qt6::Positioning
Qt6::Test
Qt6::Widgets
AutoPilotPlugins
Comms
MissionManager
MAVLink
MockLink
)
qt_add_resources(qgcunittest
"qgcunittest_res"
FILES
TranslationTest.json
TranslationTest_de_DE.ts
)
target_include_directories(qgcunittest PUBLIC ${CMAKE_CURRENT_SOURCE_DIR})
test/qgcunittest/MainWindowTest.h
+1 -1
View File
@@ -16,7 +16,7 @@
#pragma once
#include "UnitTest.h"
#include "QGCMAVLink.h"
#include "MAVLinkLib.h"
class MainWindowTest : public UnitTest
{
test/qgcunittest/UnitTest.cc
+1 -3
View File
@@ -14,11 +14,9 @@
#include "Vehicle.h"
#include "AppSettings.h"
#include "SettingsManager.h"
#include "MockLink.h"
#include "LinkManager.h"
#include "QGC.h"
#include "Fact.h"
#include "MockLink.h"
#include "MissionItem.h"
#include <QtTest/QTest>
@@ -70,7 +68,7 @@ QList<UnitTest*>& UnitTest::_testList(void)
return tests;
}
int UnitTest::run(QString& singleTest)
int UnitTest::run(QStringView singleTest)
{
int ret = 0;
test/qgcunittest/UnitTest.h
+2 -3
View File
@@ -9,8 +9,8 @@
#pragma once
#include "QGCMAVLink.h"
#include "MockLink.h"
#include "MAVLinkLib.h"
#include <QtCore/QObject>
#include <QtWidgets/QFileDialog>
@@ -23,7 +23,6 @@
class QGCMessageBox;
class QGCQFileDialog;
class LinkManager;
class MockLink;
class Vehicle;
class Fact;
class LinkInterface;
@@ -39,7 +38,7 @@ public:
/// @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);
static int run(QStringView singleTest);
/// @brief Sets up for an expected QGCMessageBox
/// @param response Response to take on message box