From 329fd7a5718e76de7722dc59a6a45705588a42f1 Mon Sep 17 00:00:00 2001
From: DonLakeFlyer <dongagne@outlook.com>
Date: Wed, 13 Nov 2019 11:27:39 -0800
Subject: [PATCH] Update unit test for no auto takeoff item add

---
 src/MissionManager/MissionControllerTest.cc | 45 ---------------------
 src/MissionManager/MissionControllerTest.h  |  2 -
 2 files changed, 47 deletions(-)

diff --git a/src/MissionManager/MissionControllerTest.cc b/src/MissionManager/MissionControllerTest.cc
index effced1e7..0540fa90f 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<MissionSettingsItem*>(0);
-    SimpleMissionItem* simpleItem = visualItems->value<SimpleMissionItem*>(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 88a4ec6e0..fda248dff 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
-- 
2.22.0