From 6532f68651ed41f0d8209c47ed783271d4a7cfac Mon Sep 17 00:00:00 2001 From: DonLakeFlyer Date: Sun, 18 Jun 2017 12:05:12 -0700 Subject: [PATCH] Rename unit test location --- UnitTest.qrc | 3 ++- src/MissionManager/MissionCommandTree.cc | 12 ++++++------ src/MissionManager/PlanMasterControllerTest.cc | 4 ++-- 3 files changed, 10 insertions(+), 9 deletions(-) diff --git a/UnitTest.qrc b/UnitTest.qrc index 3332cf8..7d46cc2 100644 --- a/UnitTest.qrc +++ b/UnitTest.qrc @@ -1,5 +1,6 @@ - + + src/MissionManager/UnitTest/SectionTest.plan src/MissionManager/UnitTest/MavCmdInfoCommon.json src/MissionManager/UnitTest/MavCmdInfoFixedWing.json src/MissionManager/UnitTest/MavCmdInfoMultiRotor.json diff --git a/src/MissionManager/MissionCommandTree.cc b/src/MissionManager/MissionCommandTree.cc index 42254c3..9513a04 100644 --- a/src/MissionManager/MissionCommandTree.cc +++ b/src/MissionManager/MissionCommandTree.cc @@ -38,12 +38,12 @@ void MissionCommandTree::setToolbox(QGCToolbox* toolbox) #ifdef UNITTEST_BUILD if (_unitTest) { // Load unit testing tree - _staticCommandTree[MAV_AUTOPILOT_GENERIC][MAV_TYPE_GENERIC] = new MissionCommandList(":/json/unittest/MavCmdInfoCommon.json", true, this); - _staticCommandTree[MAV_AUTOPILOT_GENERIC][MAV_TYPE_FIXED_WING] = new MissionCommandList(":/json/unittest/MavCmdInfoFixedWing.json", false, this); - _staticCommandTree[MAV_AUTOPILOT_GENERIC][MAV_TYPE_QUADROTOR] = new MissionCommandList(":/json/unittest/MavCmdInfoMultiRotor.json", false, this); - _staticCommandTree[MAV_AUTOPILOT_GENERIC][MAV_TYPE_VTOL_QUADROTOR] = new MissionCommandList(":/json/unittest/MavCmdInfoVTOL.json", false, this); - _staticCommandTree[MAV_AUTOPILOT_GENERIC][MAV_TYPE_SUBMARINE] = new MissionCommandList(":/json/unittest/MavCmdInfoSub.json", false, this); - _staticCommandTree[MAV_AUTOPILOT_GENERIC][MAV_TYPE_GROUND_ROVER] = new MissionCommandList(":/json/unittest/MavCmdInfoRover.json", false, this); + _staticCommandTree[MAV_AUTOPILOT_GENERIC][MAV_TYPE_GENERIC] = new MissionCommandList(":/unittest/MavCmdInfoCommon.json", true, this); + _staticCommandTree[MAV_AUTOPILOT_GENERIC][MAV_TYPE_FIXED_WING] = new MissionCommandList(":/unittest/MavCmdInfoFixedWing.json", false, this); + _staticCommandTree[MAV_AUTOPILOT_GENERIC][MAV_TYPE_QUADROTOR] = new MissionCommandList(":/unittest/MavCmdInfoMultiRotor.json", false, this); + _staticCommandTree[MAV_AUTOPILOT_GENERIC][MAV_TYPE_VTOL_QUADROTOR] = new MissionCommandList(":/unittest/MavCmdInfoVTOL.json", false, this); + _staticCommandTree[MAV_AUTOPILOT_GENERIC][MAV_TYPE_SUBMARINE] = new MissionCommandList(":/unittest/MavCmdInfoSub.json", false, this); + _staticCommandTree[MAV_AUTOPILOT_GENERIC][MAV_TYPE_GROUND_ROVER] = new MissionCommandList(":/unittest/MavCmdInfoRover.json", false, this); } else { #endif // Load all levels of hierarchy diff --git a/src/MissionManager/PlanMasterControllerTest.cc b/src/MissionManager/PlanMasterControllerTest.cc index f52b534..c27162b 100644 --- a/src/MissionManager/PlanMasterControllerTest.cc +++ b/src/MissionManager/PlanMasterControllerTest.cc @@ -40,13 +40,13 @@ void PlanMasterControllerTest::cleanup(void) void PlanMasterControllerTest::_testMissionFileLoad(void) { - _masterController->loadFromFile(":/json/unittest/OldFileFormat.mission"); + _masterController->loadFromFile(":/unittest/OldFileFormat.mission"); QCOMPARE(_masterController->missionController()->visualItems()->count(), 7); } void PlanMasterControllerTest::_testMissionPlannerFileLoad(void) { - _masterController->loadFromFile(":/json/unittest/MissionPlanner.waypoints"); + _masterController->loadFromFile(":/unittest/MissionPlanner.waypoints"); QCOMPARE(_masterController->missionController()->visualItems()->count(), 6); }