Skip to content

Q
qgroundcontrol
Commit a5ec9d2c authored by haigithub's avatar haigithub
Browse files
Options

Fix windows build bug, about MissionItemTest

parent 50ab2ed9
Hide whitespace changes
Inline Side-by-side
Showing with 37 additions and 34 deletions
src/MissionManager/MissionItemTest.cc
View file @ a5ec9d2c
...@@ -281,20 +281,20 @@ void MissionItemTest::_testLoadFromJson(void) ...@@ -281,20 +281,20 @@ void MissionItemTest::_testLoadFromJson(void)
{ {
MissionItem missionItem; MissionItem missionItem;
QString errorString; QString errorString;
QJsonArray coordinateArray = { -10.0, -20.0, -30.0 }; QJsonArray coordinateArray;
QJsonObject jsonObject coordinateArray << -10.0 << -20.0 <<-30.0;
{ QJsonObject jsonObject;
{ "autoContinue", true }, jsonObject.insert("autoContinue", true);
{ "command", 80 }, jsonObject.insert("command", 80);
{ "frame", 3 }, jsonObject.insert("frame", 3);
{ "id", 10 }, jsonObject.insert("id", 10);
{ "param1", 10 }, jsonObject.insert("param1", 10);
{ "param2", 20 }, jsonObject.insert("param2", 20);
{ "param3", 30 }, jsonObject.insert("param3", 30);
{ "param4", 40 }, jsonObject.insert("param4", 40);
{ "type", "missionItem" }, jsonObject.insert("type", "missionItem");
{ "coordinate", coordinateArray }, jsonObject.insert("coordinate", coordinateArray);
};
// Test missing key detection // Test missing key detection
...@@ -317,7 +317,8 @@ void MissionItemTest::_testLoadFromJson(void) ...@@ -317,7 +317,8 @@ void MissionItemTest::_testLoadFromJson(void)
QVERIFY(!errorString.isEmpty()); QVERIFY(!errorString.isEmpty());
qDebug() << errorString; qDebug() << errorString;
QJsonArray badCoordinateArray = { -10.0, -20.0 }; QJsonArray badCoordinateArray;
badCoordinateArray << -10.0 << -20.0 ;
badObject = jsonObject; badObject = jsonObject;
badObject.remove("coordinate"); badObject.remove("coordinate");
badObject["coordinate"] = badCoordinateArray; badObject["coordinate"] = badCoordinateArray;
...@@ -325,19 +326,22 @@ void MissionItemTest::_testLoadFromJson(void) ...@@ -325,19 +326,22 @@ void MissionItemTest::_testLoadFromJson(void)
QVERIFY(!errorString.isEmpty()); QVERIFY(!errorString.isEmpty());
qDebug() << errorString; qDebug() << errorString;
badCoordinateArray = { -10.0, -20.0, true }; QJsonArray badCoordinateArray_second;
badCoordinateArray_second << -10.0 << -20.0 << true;
badObject = jsonObject; badObject = jsonObject;
badObject.remove("coordinate"); badObject.remove("coordinate");
badObject["coordinate"] = badCoordinateArray; badObject["coordinate"] = badCoordinateArray_second;
QCOMPARE(missionItem.load(badObject, errorString), false); QCOMPARE(missionItem.load(badObject, errorString), false);
QVERIFY(!errorString.isEmpty()); QVERIFY(!errorString.isEmpty());
qDebug() << errorString; qDebug() << errorString;
QJsonArray badCoordinateArray2 = { 1, 2 }; QJsonArray badCoordinateArray2;
badCoordinateArray = { -10.0, -20.0, badCoordinateArray2 }; badCoordinateArray2 << 1 << 2;
QJsonArray badCoordinateArray_third;
badCoordinateArray_third << -10.0 << -20.0 << badCoordinateArray2;
badObject = jsonObject; badObject = jsonObject;
badObject.remove("coordinate"); badObject.remove("coordinate");
badObject["coordinate"] = badCoordinateArray; badObject["coordinate"] = badCoordinateArray_third;
QCOMPARE(missionItem.load(badObject, errorString), false); QCOMPARE(missionItem.load(badObject, errorString), false);
QVERIFY(!errorString.isEmpty()); QVERIFY(!errorString.isEmpty());
qDebug() << errorString; qDebug() << errorString;
...@@ -364,20 +368,19 @@ void MissionItemTest::_testSimpleLoadFromJson(void) ...@@ -364,20 +368,19 @@ void MissionItemTest::_testSimpleLoadFromJson(void)
SimpleMissionItem simpleMissionItem(NULL); SimpleMissionItem simpleMissionItem(NULL);
QString errorString; QString errorString;
QJsonArray coordinateArray = { -10.0, -20.0, -30.0 }; QJsonArray coordinateArray;
QJsonObject jsonObject coordinateArray << -10.0 << -20.0 << -30.0;
{ QJsonObject jsonObject;
{ "autoContinue", true }, jsonObject.insert("autoContinue", true);
{ "command", 80 }, jsonObject.insert("command", 80);
{ "frame", 3 }, jsonObject.insert("frame", 3);
{ "id", 10 }, jsonObject.insert("id", 10);
{ "param1", 10 }, jsonObject.insert("param1", 10);
{ "param2", 20 }, jsonObject.insert("param2", 20);
{ "param3", 30 }, jsonObject.insert("param3", 30);
{ "param4", 40 }, jsonObject.insert("param4", 40);
{ "type", "missionItem" }, jsonObject.insert("type", "missionItem");
{ "coordinate", coordinateArray }, jsonObject.insert("coordinate", coordinateArray);
};
QVERIFY(simpleMissionItem.load(jsonObject, errorString)); QVERIFY(simpleMissionItem.load(jsonObject, errorString));
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment