Browse Source

Fix unit test crash

QGC4.4
DoinLakeFlyer 5 years ago
parent
commit
a8afb22b3f
  1. 26
      src/MissionManager/CameraSectionTest.cc
  2. 2
      src/MissionManager/SectionTest.cc
  3. 2
      src/MissionManager/VisualMissionItemTest.cc

26
src/MissionManager/CameraSectionTest.cc

@ -126,19 +126,19 @@ void CameraSectionTest::init(void) @@ -126,19 +126,19 @@ void CameraSectionTest::init(void)
void CameraSectionTest::cleanup(void)
{
delete _spyCamera;
delete _spySection;
delete _validGimbalItem;
delete _validDistanceItem;
delete _validTimeItem;
delete _validStartVideoItem;
delete _validStopVideoItem;
delete _validStopDistanceItem;
delete _validStopTimeItem;
delete _validTakePhotoItem;
delete _validCameraPhotoModeItem;
delete _validCameraVideoModeItem;
delete _validCameraSurveyPhotoModeItem;
_spyCamera->deleteLater();
_spySection->deleteLater();
_validGimbalItem->deleteLater();
_validDistanceItem->deleteLater();
_validTimeItem->deleteLater();
_validStartVideoItem->deleteLater();
_validStopVideoItem->deleteLater();
_validStopDistanceItem->deleteLater();
_validStopTimeItem->deleteLater();
_validTakePhotoItem->deleteLater();
_validCameraPhotoModeItem->deleteLater();
_validCameraVideoModeItem->deleteLater();
_validCameraSurveyPhotoModeItem->deleteLater();
SectionTest::cleanup();
}

2
src/MissionManager/SectionTest.cc

@ -42,7 +42,7 @@ void SectionTest::init(void) @@ -42,7 +42,7 @@ void SectionTest::init(void)
void SectionTest::cleanup(void)
{
delete _simpleItem;
_simpleItem->deleteLater();
VisualMissionItemTest::cleanup();
}

2
src/MissionManager/VisualMissionItemTest.cc

@ -51,8 +51,8 @@ void VisualMissionItemTest::init(void) @@ -51,8 +51,8 @@ void VisualMissionItemTest::init(void)
void VisualMissionItemTest::cleanup(void)
{
_masterController->deleteLater();
UnitTest::cleanup();
_masterController->deleteLater();
}
void VisualMissionItemTest::_createSpy(SimpleMissionItem* simpleItem, MultiSignalSpy** visualSpy)

Loading…
Cancel
Save