diff --git a/src/MissionManager/MissionControllerTest.cc b/src/MissionManager/MissionControllerTest.cc index effced1e7205cc95445fca08cdb2a483815ffc32..0540fa90ffef6895a0c9b1fedad65c217fb0069b 100644 --- a/src/MissionManager/MissionControllerTest.cc +++ b/src/MissionManager/MissionControllerTest.cc @@ -111,51 +111,6 @@ void MissionControllerTest::_testEmptyVehicleAPM(void) _testEmptyVehicleWorker(MAV_AUTOPILOT_ARDUPILOTMEGA); } -void MissionControllerTest::_testAddWaypointWorker(MAV_AUTOPILOT firmwareType) -{ - _initForFirmwareType(firmwareType); - - QGeoCoordinate coordinate(37.803784, -122.462276); - - _missionController->insertSimpleMissionItem(coordinate, _missionController->visualItems()->count()); - - QmlObjectListModel* visualItems = _missionController->visualItems(); - QVERIFY(visualItems); - - QCOMPARE(visualItems->count(), 2); - - MissionSettingsItem* settingsItem = visualItems->value(0); - SimpleMissionItem* simpleItem = visualItems->value(1); - QVERIFY(settingsItem); - QVERIFY(simpleItem); - - QCOMPARE((MAV_CMD)simpleItem->command(), MAV_CMD_NAV_TAKEOFF); - QCOMPARE(simpleItem->childItems()->count(), 0); - - // Planned home position should always be set after first item - QVERIFY(settingsItem->coordinate().isValid()); - - // ArduPilot takeoff command has no coordinate, so should be child item - QCOMPARE(settingsItem->childItems()->count(), firmwareType == MAV_AUTOPILOT_ARDUPILOTMEGA ? 1 : 0); - - // Check waypoint line from home to takeoff - int expectedLineCount = firmwareType == MAV_AUTOPILOT_ARDUPILOTMEGA ? 0 : 1; - QmlObjectListModel* waypointLines = _missionController->waypointLines(); - QVERIFY(waypointLines); - QCOMPARE(waypointLines->count(), expectedLineCount); -} - -void MissionControllerTest::_testAddWayppointAPM(void) -{ - _testAddWaypointWorker(MAV_AUTOPILOT_ARDUPILOTMEGA); -} - - -void MissionControllerTest::_testAddWayppointPX4(void) -{ - _testAddWaypointWorker(MAV_AUTOPILOT_PX4); -} - #if 0 void MissionControllerTest::_testOfflineToOnlineWorker(MAV_AUTOPILOT firmwareType) { diff --git a/src/MissionManager/MissionControllerTest.h b/src/MissionManager/MissionControllerTest.h index 88a4ec6e034a87a334591d3c04ce3c641093d3be..fda248dffe0ca71be4adc99aeb3e2bd3026c0997 100644 --- a/src/MissionManager/MissionControllerTest.h +++ b/src/MissionManager/MissionControllerTest.h @@ -36,8 +36,6 @@ private slots: void _testLoadJsonSectionAvailable(void); void _testEmptyVehicleAPM(void); void _testEmptyVehiclePX4(void); - void _testAddWayppointAPM(void); - void _testAddWayppointPX4(void); private: #if 0